summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl/juju2')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml14
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/subordinate.yaml2
2 files changed, 5 insertions, 11 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
index 28ad55c4..eec485eb 100644
--- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
@@ -4,17 +4,9 @@
{% if os.service.bindings %}
bindings:
shared-db: internal-api
- internal: internal-api
-{% if opnfv.spaces_dict.public is defined %}
- public: public-api
-{% if opnfv.spaces_dict.data is defined %}
- admin: admin-api
-{% else %}
- admin: internal-api
-{% endif %}
-{% else %}
- admin: internal-api
- public: internal-api
+ website: internal-api
+{% if os.ha.mode == 'ha' %}
+ cluster: internal-api
{% endif %}
{% endif %}
options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index be7ced2c..2e0f7876 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -30,6 +30,8 @@
{% endif %}
{% if opnfv.spaces_dict.data is defined %}
os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% else %}
+ os-data-network: {{ opnfv.spaces_dict.admin.cidr }}
{% endif %}
{% elif os.network.controller == 'onos' %}
neutron-api-onos: