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 cba9b79..c789df6 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
@@ -2,32 +2,36 @@
       charm: "./{{ ubuntu.release }}/openstack-dashboard"
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
+      constraints: *oam-space-constr
       bindings:
-        shared-db: internal-api
-{% if opnfv.spaces_dict.public is defined %}
-        website: public-api
-{% else %}
-        website: internal-api
-{% endif %}
-{% if os.ha.mode == 'ha' %}
-        cluster: internal-api
-{% endif %}
+        "": *public-space
+        shared-db: *internal-space
 {% endif %}
+      series: {{ ubuntu.release }}
       options:
-        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        openstack-origin: *openstack-origin
 {% if os.git_repo.origin_git %}
         openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
         secret: admin
         webroot: /
+        neutron-network-lb: True
+        neutron-network-firewall: False
+        cinder-backup: False
+        password-retrieve: True
 {% if os.network.ipv6 %}
         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() %}