Charm Helpers

Merge lp:~hopem/charm-helpers/add-cinder-backup-amulet-support into lp:charm-helpers

  1. add-cinder-backup-amulet-support
  2. Merge into devel
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 519
Proposed branch: lp:~hopem/charm-helpers/add-cinder-backup-amulet-support
Merge into: lp:charm-helpers
Diff against target: 13 lines (+2/-1)
1 file modified
charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1)
To merge this branch: bzr merge lp:~hopem/charm-helpers/add-cinder-backup-amulet-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+282883@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Approved

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 2015-12-14 17:09:21 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2016-01-17 21:37:42 +0000
4@@ -125,7 +125,8 @@
5
6 # Charms which can not use openstack-origin, ie. many subordinates
7 no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
8- 'openvswitch-odl', 'neutron-api-odl', 'odl-controller']
9+ 'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
10+ 'cinder-backup']
11
12 if self.openstack:
13 for svc in services:

Subscribers

People subscribed via source and target branches