Merge lp://qastaging/~hazmat/charms/precise/rabbitmq-server/ssl-everywhere into lp://qastaging/charms/rabbitmq-server

Proposed by Kapil Thangavelu
Status: Superseded
Proposed branch: lp://qastaging/~hazmat/charms/precise/rabbitmq-server/ssl-everywhere
Merge into: lp://qastaging/charms/rabbitmq-server
Diff against target: 926 lines (+562/-105) (has conflicts)
12 files modified
Makefile (+15/-0)
charm-helpers.yaml (+2/-1)
config.yaml (+22/-4)
hooks/lib/utils.py (+8/-11)
hooks/rabbit_utils.py (+30/-15)
hooks/rabbitmq_server_relations.py (+82/-26)
lib/charmhelpers/contrib/openstack/context.py (+104/-41)
lib/charmhelpers/contrib/openstack/utils.py (+9/-5)
lib/charmhelpers/contrib/ssl/service.py (+267/-0)
lib/charmhelpers/core/hookenv.py (+6/-0)
revision (+4/-0)
templates/rabbitmq.config (+13/-2)
Text conflict in revision
To merge this branch: bzr merge lp://qastaging/~hazmat/charms/precise/rabbitmq-server/ssl-everywhere
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
charmers Pending
Review via email: mp+207912@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-03-04.

Description of the change

SSL Support for RabbitMQ

Adds a few additional configuration options for SSL.

'ssl' is the primary one, it can be 'off', 'on', or 'only'.

If its off, no changes. If its 'on' then ssl support is
enabled and ssl_ca cert is sent to clients along the relation.

If its only, then all clients must connect using ssl.

The server cert/key and ca cert can be provided via config. If
they are not, the service will act as its own ca and provide
the ssl_ca cert to its related clients.

https://codereview.appspot.com/68140043/

To post a comment you must log in.
Revision history for this message
Kapil Thangavelu (hazmat) wrote :

Reviewers: mp+207912_code.launchpad.net,

Message:
Please take a look.

Description:
SSL Support for RabbitMQ

Adds a few additional configuration options for SSL.

'ssl' is the primary one, it can be 'off', 'on', or 'only'.

If its off, no changes. If its 'on' then ssl support is
enabled and ssl_ca cert is sent to clients along the relation.

If its only, then all clients must connect using ssl.

The server cert/key and ca cert can be provided via config. If
they are not, the service will act as its own ca and provide
the ssl_ca cert to its related clients.

https://code.launchpad.net/~hazmat/charms/precise/rabbitmq-server/ssl-everywhere/+merge/207912

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/68140043/

Affected files (+564, -106 lines):
   A Makefile
   A [revision details]
   M charm-helpers.yaml
   M config.yaml
   M hooks/lib/utils.py
   M hooks/rabbit_utils.py
   M hooks/rabbitmq_server_relations.py
   M lib/charmhelpers/contrib/openstack/context.py
   M lib/charmhelpers/contrib/openstack/utils.py
   A lib/charmhelpers/contrib/ssl/service.py
   M lib/charmhelpers/core/hookenv.py
   M revision
   M templates/rabbitmq.config

51. By Kapil Thangavelu

sync helpers

52. By Kapil Thangavelu

incr rev for existing envs

53. By Kapil Thangavelu

sync helpers

54. By Kapil Thangavelu

sync charm-helpers

55. By Kapil Thangavelu

sync helpers

56. By Kapil Thangavelu

sync helpers

Revision history for this message
Charles Butler (lazypower) wrote :

On 2014/02/24 12:11:56, hazmat wrote:
> Please take a look.

+1 LGTM

https://codereview.appspot.com/68140043/

Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM

review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches