Charm Helpers

Merge lp:~gnuoy/charm-helpers/exlude-no-openstack-origin into lp:charm-helpers

  1. exlude-no-openstack-origin
  2. Merge into devel
Proposed by Liam Young on 2015-11-09
Status: Merged
Merged at revision: 479
Proposed branch: lp:~gnuoy/charm-helpers/exlude-no-openstack-origin
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:~gnuoy/charm-helpers/exlude-no-openstack-origin
Reviewer Review Type Date Requested Status
James Page 2015-11-09 Approve on 2015-11-12
Review via email: mp+277005@code.launchpad.net
To post a comment you must log in.
James Page (james-page) :
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-10-21 03:26:55 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2015-11-09 13:39:51 +0000
4@@ -124,7 +124,8 @@
5 'ceph-osd', 'ceph-radosgw']
6
7 # Charms which can not use openstack-origin, ie. many subordinates
8- no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe']
9+ no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
10+ 'openvswitch-odl', 'neutron-api-odl', 'odl-controller']
11
12 if self.openstack:
13 for svc in services:

Subscribers

People subscribed via source and target branches