From ce06a995fd8986c5cb6502b4070a8f6e79bbe9f8 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 26 Jul 2017 00:01:35 -0500 Subject: modified to remove gateway as not needed with OCL Change-Id: If08c12d9ffd2a8567fccd77473ead1483bd7dff0 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 2 ++ ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml | 2 ++ ci/config_tpl/juju2/bundle_tpl/relations.yaml | 6 ++++-- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'ci/config_tpl') diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml index bfc297d0..575aa8f8 100644 --- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml @@ -56,7 +56,9 @@ {% include 'rabbitmq.yaml' %} {% include 'heat.yaml' %} {% include 'neutron-api.yaml' %} +{% if os.network.controller != 'ocl' %} {% include 'neutron-gateway.yaml' %} +{% endif %} {% include 'aodh.yaml' %} {% if os.network.controller == 'odl' %} {% include 'odl.yaml' %} diff --git a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml index ee743e93..59d2c7d7 100644 --- a/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/oclphase1.yaml @@ -102,6 +102,8 @@ contrail-keystone-auth: charm: ./{{ ubuntu.release }}/contrail-keystone-auth num_units: 1 + bindings: + "": internal-api to: - "lxd:nodes/0" diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml index 7d7f41b3..4a2fa787 100644 --- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml @@ -1,19 +1,21 @@ - [ 'nova-compute:amqp', 'rabbitmq-server:amqp' ] +{% if os.network.controller != 'ocl' %} - [ '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' ] +{% endif %} - [ 'keystone:shared-db', 'mysql:shared-db' ] - [ 'nova-cloud-controller:identity-service', 'keystone:identity-service' ] - [ 'glance:identity-service', 'keystone:identity-service' ] - [ 'neutron-api:identity-service', 'keystone:identity-service' ] - [ 'neutron-api:shared-db', 'mysql:shared-db' ] - [ 'neutron-api:amqp', 'rabbitmq-server:amqp' ] - - [ 'neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ] - [ 'glance:shared-db', 'mysql:shared-db' ] - [ 'glance:amqp', 'rabbitmq-server:amqp' ] - [ 'nova-cloud-controller:image-service', 'glance:image-service' ] - [ 'nova-compute:image-service', 'glance:image-service' ] - [ 'nova-cloud-controller:cloud-compute', 'nova-compute:cloud-compute' ] - [ 'nova-cloud-controller:amqp', 'rabbitmq-server:amqp' ] - - [ 'nova-cloud-controller:quantum-network-service', 'neutron-gateway:quantum-network-service' ] - [ 'openstack-dashboard:identity-service', 'keystone:identity-service' ] - [ 'nova-cloud-controller:shared-db', 'mysql:shared-db' ] - [ 'nova-cloud-controller:neutron-api', 'neutron-api:neutron-api' ] -- cgit 1.2.3-korg