Juju Charms Collection
rabbitmq-server package

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

Proposed by Kapil Thangavelu on 2014-03-04

Status:	Merged
Merged at revision:	52
Proposed branch:	lp://qastaging/~openstack-charmers/charms/precise/rabbitmq-server/ssl-everywhere
Merge into:	lp://qastaging/charms/rabbitmq-server
Diff against target:	904 lines (+588/-62) (has conflicts) 10 files modified Makefile (+15/-0) charm-helpers.yaml (+2/-1) config.yaml (+45/-7) hooks/lib/ceph_utils.py (+4/-2) hooks/lib/utils.py (+19/-2) hooks/rabbit_utils.py (+30/-15) hooks/rabbitmq_server_relations.py (+120/-18) lib/charmhelpers/contrib/openstack/context.py (+73/-15) lib/charmhelpers/contrib/ssl/service.py (+267/-0) templates/rabbitmq.config (+13/-2) Conflict adding file Makefile. Moved existing file to Makefile.moved. Text conflict in config.yaml Text conflict in hooks/lib/utils.py Text conflict in hooks/rabbitmq_server_relations.py Text conflict in lib/charmhelpers/contrib/openstack/context.py
To merge this branch:	bzr merge lp://qastaging/~openstack-charmers/charms/precise/rabbitmq-server/ssl-everywhere
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Charles Butler	2014-03-04	Pending
charmers	2014-03-04	Pending
Review via email: mp+209299@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-02-24.

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/

Revision history for this message

Kapil Thangavelu (hazmat) wrote on 2014-02-24: Posted in a previous version of this proposal

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