modified to remove dns for K8 relationship.

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

diff --git a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml
index 8d60475..43d8ef2 100644 (file)
--- a/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml
+++ b/ci/config_tpl/bundle_tpl/openstack-dashboard.yaml
@@ -2,13 +2,13 @@
       charm: "local:{{ ubuntu.release }}/openstack-dashboard"
       num_units: {{ unit_qty() }}
       options:
+        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
         secret: admin
         webroot: /
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
 {% if os.ha.mode == 'ha' %}
-        haproxy-server-timeout: 10000
-        haproxy-client-timeout: 10000
-        haproxy-queue-timeout: 10000
-        haproxy-connect-timeout: 10000
         vip: {{ opnfv.vip.dashboard }}
 {% endif %}
 {% if os.beta.public_api %}