X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fconfig_tpl%2Fjuju2%2Fbundle_tpl%2Fkeystone.yaml;h=685ff37091d2566cd407d769960dc823d1f8321a;hb=0cd6c7dac297478d5dd66313aef09e5e5324d2ad;hp=65c1f76c7b730a758718484aa4107648d0784498;hpb=f1dfc0776d32dea2a2fe7e2cb2b15b1836a6b666;p=joid.git

diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index 65c1f76c..685ff370 100644
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -1,11 +1,26 @@
     keystone:
       charm: "./{{ ubuntu.release }}/keystone"
       num_units: {{ unit_qty() }}
+{% if os.service.bindings %}
+      bindings:
+        internal: internal-api
+{% if opnfv.spaces_dict.data is defined %}
+        admin: admin-api
+{% else %}
+        admin: internal-api
+{% endif %}
+{% if opnfv.spaces_dict.public is defined %}
+        public: public-api
+{% else %}
+        public: internal-api
+{% endif %}
+{% endif %}
       options:
         openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
         region: {{ os.region }}
         admin-role: {{ os.admin.role }}
         keystone-admin-role: {{ os.admin.role }}
+        preferred-api-version: 2
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}