From 125d7e8a30700c63f6b015552c4826acc6223bf2 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 6 Sep 2017 14:59:02 -0500 Subject: use keystone V2 for Opencontrail. Change-Id: Ie505072ded1009ce799ea17f7e9e5b91677aff03 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 2 ++ 1 file changed, 2 insertions(+) (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 1c6b78f6..233d1d72 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -17,7 +17,9 @@ 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 %} -- cgit 1.2.3-korg