adding bionic support.

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / openstack-dashboard.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
index 9132096..c789df6 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
@@ -7,6 +7,7 @@
         "": *public-space
         shared-db: *internal-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
         openstack-origin: *openstack-origin
 {% if os.git_repo.origin_git %}
@@ -22,10 +23,15 @@
         prefer-ipv6: {{ os.network.ipv6 }}
 {% endif %}
 {% if os.ha.mode == 'ha' %}
-        vip: {{ opnfv.vip.dashboard }}
+        vip: *dashboard-vip
 {% endif %}
-{% if os.beta.public_api %}
-        endpoint-type: internalURL
+{% if os.api.ssl %}
+        ssl_ca: *ssl_ca
+        ssl_cert: *ssl_cert
+        ssl_key: *ssl_key
+        os-public-hostname: *hostname_dashboard_public
+        os-internal-hostname: *hostname_dashboard_public
+        os-admin-hostname: *hostname_dashboard_public
 {% endif %}
       to:
 {% for unit_id in to_select() %}