diff options
Diffstat (limited to 'ci/odl/juju-deployer')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 740cb16a..5f813acb 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -155,7 +155,7 @@ openstack-phase2: branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp options: overlay-network-type: 'vxlan gre' - security-groups: true + security-groups: True openvswitch-odl: branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk relations: @@ -184,11 +184,11 @@ openstack-phase2: - - "nova-cloud-controller:shared-db" - "percona-cluster:shared-db" - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" + - "rabbitmq-server:amqp" - - "nova-cloud-controller:image-service" - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" - - "nova-cloud-controller:cloud-compute" - "nova-compute:cloud-compute" - - "nova-compute:amqp" @@ -197,26 +197,26 @@ openstack-phase2: - "glance:image-service" - - "glance:shared-db" - "percona-cluster:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" + - - "glance:identity-service" + - "keystone:identity-service" - - "glance:amqp" - "rabbitmq-server:amqp" - - "openstack-dashboard:identity-service" - - "keystone:identity-service" + - "keystone:identity-service" - - "neutron-api:shared-db" - "percona-cluster:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" + - - "neutron-api:amqp" + - "rabbitmq-server:amqp" - - "nova-cloud-controller:neutron-api" - "neutron-api:neutron-api" - - "neutron-api:identity-service" - "keystone:identity-service" - - "neutron-gateway:amqp" - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" + - - "neutron-gateway:neutron-plugin-api" + - "neutron-api:neutron-plugin-api" + - - "nova-cloud-controller:quantum-network-service" + - "neutron-gateway:quantum-network-service" trusty-liberty-nodes: inherits: openstack-phase1 overrides: |