Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
use keystone V2 for Opencontrail.
[joid.git]
/
ci
/
config_tpl
/
juju2
/
bundle_tpl
/
keystone.yaml
diff --git
a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index
1c6b78f
..
233d1d7
100644
(file)
--- 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 %}