diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-09-06 14:59:02 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-09-06 14:59:02 -0500 |
| commit | 125d7e8a30700c63f6b015552c4826acc6223bf2 (patch) | |
| tree | d2eb5ab5d64977d0efe5da1b2d2cdb0ce155fbd5 /ci/config_tpl/juju2 | |
| parent | 61607ce57ddb99245d8e6485022cd9cf5ac5cbde (diff) | |
use keystone V2 for Opencontrail.
Change-Id: Ie505072ded1009ce799ea17f7e9e5b91677aff03
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
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 %} |