From eff90653600887c51603d2f30b0f9d4060885eb9 Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 1 Apr 2016 11:49:27 +0100 Subject: [PATCH] Sync correct charm-helpers branch Revert accidential commit that made use of an obsolete feature branch for charm-helpers. Change-Id: I7e50cfa2e2b836a087d48c93ab146d5532b11793 --- charm-helpers-hooks.yaml | 2 +- hooks/charmhelpers/contrib/openstack/amulet/deployment.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 6c7d6fac..1caab11d 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -branch: lp:~james-page/charm-helpers/network-spaces-api-endpoints +branch: lp:charm-helpers destination: hooks/charmhelpers include: - core diff --git a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py index d2ede320..d21c9c78 100644 --- a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py +++ b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py @@ -126,7 +126,9 @@ class OpenStackAmuletDeployment(AmuletDeployment): # Charms which can not use openstack-origin, ie. many subordinates no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe', 'openvswitch-odl', 'neutron-api-odl', 'odl-controller', - 'cinder-backup'] + 'cinder-backup', 'nexentaedge-data', + 'nexentaedge-iscsi-gw', 'nexentaedge-swift-gw', + 'cinder-nexentaedge', 'nexentaedge-mgmt'] if self.openstack: for svc in services: