openstack/charm-neutron-api
Code Issues Proposed changes

Sync correct charm-helpers branch

Browse Source 
Revert accidential commit that made use of an obsolete
feature branch for charm-helpers.

Change-Id: I7e50cfa2e2b836a087d48c93ab146d5532b11793
This commit is contained in:
James Page 2016-04-01 11:49:27 +01:00
parent 5e33f255ba
commit eff9065360
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charm-helpers-hooks.yaml
View File

@ -1,4 +1,4 @@
branch: lp:~james-page/charm-helpers/network-spaces-api-endpoints branch: lp:charm-helpers
destination: hooks/charmhelpers destination: hooks/charmhelpers
include: include:
- core - core

4
hooks/charmhelpers/contrib/openstack/amulet/deployment.py
View File

@ -126,7 +126,9 @@ class OpenStackAmuletDeployment(AmuletDeployment):
# Charms which can not use openstack-origin, ie. many subordinates # Charms which can not use openstack-origin, ie. many subordinates
no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe', no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
'openvswitch-odl', 'neutron-api-odl', 'odl-controller', '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: if self.openstack:
for svc in services: for svc in services: