From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Sat, 11 Feb 2017 07:26:26 +0000 (-0600)
Subject: modfiied for JUJU 2.1-rc1 changes.
X-Git-Tag: danube.1.0~43
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7b7d4454f192ef25a3ff200c156dcd840d09a91e;p=joid.git

modfiied for JUJU 2.1-rc1 changes.

Change-Id: I593e2bf7cf14fe87bde6d83de70ed7fff1b40d2a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

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: