From 266e1857937d44a0f5a290cc13a8de5bff50eba3 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 30 May 2017 14:26:11 +0000 Subject: Revert "modified to use latest Carbon build release." This reverts commit f258a7449d73f54f6bae7089d59c030cdbed780c. Change-Id: Ia9890a11a9ffd6fb3fb5bff53868f956342eaa0f Signed-off-by: Narinder Gupta --- .../juju2/bundle_tpl/neutron-gateway.yaml | 34 ++++++++++++++++++++-- ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml | 12 +++++++- ci/config_tpl/juju2/bundle_tpl/odl.yaml | 2 +- ci/config_tpl/juju2/bundle_tpl/relations.yaml | 18 ++++-------- 4 files changed, 49 insertions(+), 17 deletions(-) (limited to 'ci/config_tpl') diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml index 0e56142e..f8a3f91a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml @@ -18,17 +18,45 @@ {% if os.api.worker_multiplier %} worker-multiplier: {{ os.api.worker_multiplier }} {% endif %} +{% if os.network.controller == 'nosdn' %} {% if opnfv.ext_port is defined %} - bridge-mappings: physnet1:br-data - data-port: br-data:{{ opnfv.ext_port }} +{% if opnfv.data_port is defined %} + bridge-mappings: physnet1:br-ex physnet2:br-data + data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} +{% else %} + bridge-mappings: physnet1:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} {% endif %} -{% if os.network.controller == 'onos' %} +{% elif os.network.controller == 'onos' %} plugin: onos +{% if opnfv.ext_port is defined %} +{% if opnfv.data_port is defined %} + bridge-mappings: physnet1:br-data external:br-ex + data-port: br-data:{{ opnfv.data_port }} br-ex:{{ opnfv.ext_port }} +{% else %} + bridge-mappings: external:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% endif %} {% if os.network.sfc %} profile: onos-sfc {% endif %} {% elif os.network.controller == 'odl' %} plugin: ovs-odl +{% if opnfv.ext_port is defined %} +{% if opnfv.data_port is defined %} + bridge-mappings: physnet1:br-ex physnet2:br-data + data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} +{% else %} + bridge-mappings: physnet1:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% endif %} +{% else %} +{% if opnfv.ext_port is defined %} + ext-port: {{ opnfv.ext_port }} +{% endif %} {% endif %} instance-mtu: 1400 to: diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml index 9938bf13..92be0418 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml @@ -27,6 +27,16 @@ #default-socket-cores: 1 {% endif %} {% if opnfv.ext_port is defined %} - bridge-mappings: physnet1:br-data +{% if os.network.controller == 'nosdn' %} +{% if opnfv.data_port is defined %} + bridge-mappings: physnet1:br-ex physnet2:br-data + data-port: br-ex:{{ opnfv.ext_port }} br-data:{{ opnfv.data_port }} +{% else %} + bridge-mappings: physnet1:br-ex + data-port: br-ex:{{ opnfv.ext_port }} +{% endif %} +{% else %} + ext-port: {{ opnfv.ext_port }} +{% endif %} {% endif %} {# Empty block to avoid bad block trim #} diff --git a/ci/config_tpl/juju2/bundle_tpl/odl.yaml b/ci/config_tpl/juju2/bundle_tpl/odl.yaml index d1d0f0b5..5580449f 100644 --- a/ci/config_tpl/juju2/bundle_tpl/odl.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/odl.yaml @@ -6,7 +6,7 @@ "": internal-api {% endif %} options: - install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.0-Carbon/distribution-karaf-0.6.0-Carbon.tar.gz" + install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.2-Boron-SR2/distribution-karaf-0.5.2-Boron-SR2.tar.gz" {% if os.network.sfc %} profile: "openvswitch-odl-beryllium-sfc" {% elif os.network.bgpvpn %} diff --git a/ci/config_tpl/juju2/bundle_tpl/relations.yaml b/ci/config_tpl/juju2/bundle_tpl/relations.yaml index 00c460b0..012d696d 100644 --- a/ci/config_tpl/juju2/bundle_tpl/relations.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/relations.yaml @@ -6,14 +6,14 @@ - [ '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' ] + - [ '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' ] - - [ 'neutron-gateway', 'nova-cloud-controller' ] + - [ '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' ] @@ -45,16 +45,11 @@ {% endif %} {% endif %} - [ 'ceilometer:amqp', 'rabbitmq-server:amqp' ] + - [ 'ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service' ] - [ 'ceilometer:identity-service', 'keystone:identity-service' ] - [ 'ceilometer:identity-notifications', 'keystone:identity-notifications' ] + - [ 'ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer' ] - [ 'ceilometer:shared-db', 'mongodb:database' ] - - [ 'ceilometer-agent', 'nova-compute' ] - - [ 'ceilometer-agent', 'ceilometer' ] - - [ 'ceilometer-agent', 'glance' ] - - [ 'ceilometer-agent', 'heat' ] - - [ 'ceilometer-agent', 'cinder' ] - - [ 'ceilometer-agent', 'neutron-api' ] - - [ 'ceilometer-agent', 'nova-cloud-controller' ] - [ 'heat:shared-db', 'mysql:shared-db' ] - [ 'heat:identity-service', 'keystone:identity-service' ] - [ 'heat:amqp', 'rabbitmq-server:amqp' ] @@ -66,9 +61,8 @@ {% endif %} {% if os.network.controller == 'nosdn' %} - [ 'neutron-openvswitch:amqp', 'rabbitmq-server:amqp' ] - - [ 'neutron-openvswitch', 'rabbitmq-server' ] - - [ 'neutron-openvswitch', 'neutron-api' ] - - [ 'nova-compute', 'neutron-openvswitch' ] + - [ 'nova-compute:neutron-plugin', 'neutron-openvswitch:neutron-plugin' ] + - [ 'neutron-openvswitch:neutron-plugin-api', 'neutron-api:neutron-plugin-api' ] {% elif os.network.controller == 'odl' %} - [ 'neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate' ] - [ 'nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin' ] -- cgit 1.2.3-korg