adding bionic support.

[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 233d1d7..9314af1 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -9,6 +9,7 @@
         internal: *internal-space
         shared-db: *internal-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
         openstack-origin: *openstack-origin
 {% if os.git_repo.origin_git %}
@@ -17,8 +18,16 @@
         region: *openstack-region
         admin-role: {{ os.admin.role }}
         keystone-admin-role: {{ os.admin.role }}
-{% if os.network.controller != 'ocl' %}
         preferred-api-version: 3
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        #use-https: 'yes'
+        #https-service-endpoints: 'True'
+        os-public-hostname: *hostname_keystone_public
+        os-internal-hostname: *hostname_keystone_public
+        os-admin-hostname: *hostname_keystone_public
 {% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
@@ -29,7 +38,7 @@
         admin-password: {{ opnfv.admin_password | default(os.admin.password) }}
         admin-token: {{ os.admin.name }}
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.keystone }}
+        vip: *keystone-vip
 {% endif %}
       to:
 {% for unit_id in to_select() %}