From 149e7053b83b2236eac66701837c0d183bb25b81 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 11 Apr 2018 16:34:01 -0500 Subject: added ssl support based on default. Change-Id: I0198520e43c81d7734bc3b2f4396e55c42d33e5c Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to '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 1c6b78f6..6450060e 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -18,6 +18,16 @@ admin-role: {{ os.admin.role }} keystone-admin-role: {{ os.admin.role }} 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 }} {% endif %} @@ -27,7 +37,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() %} -- cgit 1.2.3-korg