← Back to branch summary

~openstack-charmers-next/charms/precise/swift-proxy/trunk

« back to all changes in this revision

Viewing changes to tests/charmhelpers/contrib/openstack/amulet/deployment.py

  • Committer: James Page
  • Date: 2016-03-31 13:43:06 UTC
  • Revision ID: james.page@ubuntu.com-20160331134306-c00fm8sijuol8zew
Add Juju Network Space support

Juju 2.0 provides support for network spaces, allowing
charm authors to support direct binding of relations and
extra-bindings onto underlying network spaces.

Resync charm-helpers to pickup support in API endpoint
resolution code and add API extra-bindings to the charm
metadata.

Change-Id: I5c719eafc32948ad23b16da1eced5a26f8afdcae

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/openstack/amulet/deployment.py
126
126
        # Charms which can not use openstack-origin, ie. many subordinates
127
127
        no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
128
128
                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
129
 
                     'cinder-backup']
 
129
                     'cinder-backup', 'nexentaedge-data',
 
130
                     'nexentaedge-iscsi-gw', 'nexentaedge-swift-gw',
 
131
                     'cinder-nexentaedge', 'nexentaedge-mgmt']
130
132
 
131
133
        if self.openstack:
132
134
            for svc in services: