Charm Helpers

Merge lp:~chris.macnaughton/charm-helpers/add-ceph-proxy into lp:charm-helpers

  1. add-ceph-proxy
  2. Merge into devel
Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 602
Proposed branch: lp:~chris.macnaughton/charm-helpers/add-ceph-proxy
Merge into: lp:charm-helpers
Diff against target: 12 lines (+1/-1)
1 file modified
charmhelpers/contrib/openstack/amulet/deployment.py (+1/-1)
To merge this branch: bzr merge lp:~chris.macnaughton/charm-helpers/add-ceph-proxy
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Approve
charmers Pending
Review via email: mp+299824@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

This should square up https://review.openstack.org/#/c/339087/ - thanks! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
2--- charmhelpers/contrib/openstack/amulet/deployment.py 2016-07-07 14:14:18 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2016-07-12 15:24:07 +0000
4@@ -112,7 +112,7 @@
5
6 # Charms which should use the source config option
7 use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
8- 'ceph-osd', 'ceph-radosgw', 'ceph-mon']
9+ 'ceph-osd', 'ceph-radosgw', 'ceph-mon', 'ceph-proxy']
10
11 # Charms which can not use openstack-origin, ie. many subordinates
12 no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',

Subscribers

People subscribed via source and target branches