modfiied to corner the concerns of Orange labs.

Change-Id: I82125424714ce5083f045224f8fc9fa4c7a0edc2
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
(cherry picked from commit cb6d37a8b4f7762fbd254e9870a19c2c4d865553)

11 files changed, 14 insertions, 60 deletions

diff --git a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
index 6abc6d78..49117901 100644
--- a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
@@ -4,17 +4,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 528d605a..5c52d91d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -14,15 +14,10 @@
       bindings:
         shared-db: internal-api
         internal: internal-api
+        admin: 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
 {% endif %}
 {% endif %}
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index f3c35d05..dc4e101b 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -110,16 +110,11 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
index d350edce..8b26e25e 100644
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -8,17 +8,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/congress.yaml b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
index e9a549db..d2dcdaaf 100644
--- a/ci/config_tpl/juju2/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
@@ -4,17 +4,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
index a34a0f0b..3329ea40 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -4,17 +4,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/heat.yaml b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
index 5e03b1f7..21b2479c 100644
--- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
@@ -4,17 +4,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
index 06499b4f..4f81dc5f 100644
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -4,17 +4,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index d25a23e9..0febddd1 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -4,17 +4,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
index 2f21edf1..b5fdb103 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -4,17 +4,12 @@
 {% if os.service.bindings %}
       bindings:
         internal: internal-api
+        admin: internal-api
         shared-db: 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 %}
         public: internal-api
-        admin: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
index eec485eb..bf0ac99d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml
@@ -4,7 +4,11 @@
 {% if os.service.bindings %}
       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 %}