From 95fc8308b92849123e0994c37faec0eb4d063fa8 Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Mon, 13 Nov 2017 19:07:05 -0800 Subject: [PATCH] Keystone V3, neutron-api.yaml: manage-neutron-plugin-legacy-mode: False, patch containers after launch Change-Id: Ia434e68bc3df9812ebfb7fcaa6d02dd81f046f0b Signed-off-by: Stuart Mackie --- ci/02-deploybundle.sh | 2 +- ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 3 +++ ci/deploy.sh | 10 ++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 5a72445e..2eff3f0d 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -170,7 +170,7 @@ openfile_fix() { if [ "$opnfvsdn" = "ocl" ] then - TAG="ubuntu16.04-4.0.1.0-32.tar.gz" + TAG="ubuntu16.04-4.0.2.0-34.tar.gz" for ROLE in contrail-controller contrail-analytics contrail-analyticsdb do diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml index 233d1d72..1c6b78f6 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -17,9 +17,7 @@ region: *openstack-region admin-role: {{ os.admin.role }} keystone-admin-role: {{ os.admin.role }} -{% if os.network.controller != 'ocl' %} preferred-api-version: 3 -{% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index e59530c1..823e251a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -37,6 +37,9 @@ {% elif os.network.controller == 'onos' %} flat-network-providers: physnet1 manage-neutron-plugin-legacy-mode: False +{% elif os.network.controller == 'ocl' %} + flat-network-providers: physnet1 + manage-neutron-plugin-legacy-mode: False {% endif %} {% if os.network.dvr %} enable-dvr: true diff --git a/ci/deploy.sh b/ci/deploy.sh index 9277e857..d79cabc4 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -322,6 +322,16 @@ jujuver=`juju --version` # Configuring deployment if ([ $opnfvmodel == "openstack" ]); then + if ([ $opnfvsdn == "ocl" ]); then + echo_info "Patching OpenContrail controller container" + juju ssh contrail-controller/0 sudo docker cp contrail-controller:/etc/contrail/vnc_api_lib.ini /tmp + juju ssh contrail-controller/0 cp /tmp/vnc_api_lib.ini /tmp/vnc_api_lib.ini2 + juju ssh contrail-controller/0 'echo "AUTHN_DOMAIN = admin_domain" >> /tmp/vnc_api_lib.ini2' + juju ssh contrail-controller/0 sudo docker cp /tmp/vnc_api_lib.ini2 contrail-controller:/etc/contrail/vnc_api_lib.ini + juju ssh contrail-controller/0 sudo docker exec -it contrail-controller service contrail-api restart + + juju ssh contrail-controller/0 sudo docker cp /tmp/vnc_api_lib.ini2 contrail-analytics:/etc/contrail/vnc_api_lib.ini + fi echo_info "Configuring OpenStack deployment" ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true -- 2.16.6