Charm Helpers

Merge lp:~anton-skriptsov/charm-helpers/add_nexentaedge_to_no_origin into lp:charm-helpers

  1. add_nexentaedge_to_no_origin
  2. Merge into devel
Proposed by Anton Skriptsov
Status: Merged
Merged at revision: 555
Proposed branch: lp:~anton-skriptsov/charm-helpers/add_nexentaedge_to_no_origin
Merge into: lp:charm-helpers
Diff against target: 14 lines (+3/-1)
1 file modified
charmhelpers/contrib/openstack/amulet/deployment.py (+3/-1)
To merge this branch: bzr merge lp:~anton-skriptsov/charm-helpers/add_nexentaedge_to_no_origin
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve
Ryan Beisner (community) Approve
Review via email: mp+289824@code.launchpad.net

Description of the change

Add NexentaEdge's charms to no_origin array to pass functional tests w/o configuration errors.
All NexentaEdge charms has no source config option

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve
Revision history for this message
Charles Butler (lazypower) wrote :

With an openstackers +1, I'll land this MP. Thanks for the review @beisner

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-01-26 13:25:00 +0000
3+++ charmhelpers/contrib/openstack/amulet/deployment.py 2016-03-22 17:55:38 +0000
4@@ -126,7 +126,9 @@
5 # Charms which can not use openstack-origin, ie. many subordinates
6 no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
7 'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
8- 'cinder-backup']
9+ 'cinder-backup', 'nexentaedge-data',
10+ 'nexentaedge-iscsi-gw', 'nexentaedge-swift-gw',
11+ 'cinder-nexentaedge', 'nexentaedge-mgmt']
12
13 if self.openstack:
14 for svc in services:

Subscribers

People subscribed via source and target branches