modfiied to support the new spaces in juju.

[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 65c1f76..685ff37 100644 (file)
--- 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 %}