From 95fc8308b92849123e0994c37faec0eb4d063fa8 Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Mon, 13 Nov 2017 19:07:05 -0800 Subject: Keystone V3, neutron-api.yaml: manage-neutron-plugin-legacy-mode: False, patch containers after launch Change-Id: Ia434e68bc3df9812ebfb7fcaa6d02dd81f046f0b Signed-off-by: Stuart Mackie --- ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 2 -- ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ci/config_tpl') 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 -- cgit 1.2.3-korg