From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 6 Sep 2017 19:59:02 +0000 (-0500)
Subject: use keystone V2 for Opencontrail.
X-Git-Tag: opnfv-5.0.RC1~16
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=125d7e8a30700c63f6b015552c4826acc6223bf2;p=joid.git

use keystone V2 for Opencontrail.

Change-Id: Ie505072ded1009ce799ea17f7e9e5b91677aff03
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

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 %}