13 files changed, 54 insertions, 54 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
index 92617ea1..4adbe076 100644
--- a/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/aodh.yaml
@@ -3,16 +3,16 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: 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 554450f6..8234b87d 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -8,16 +8,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 16a3206d..9592fae6 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -82,16 +82,16 @@
       num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: 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 82c15c38..e472a693 100644
--- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml
@@ -7,16 +7,16 @@
 {% endif %}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: 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 b57bf328..3330cad1 100644
--- a/ci/config_tpl/juju2/bundle_tpl/congress.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/congress.yaml
@@ -3,16 +3,16 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: 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 e8eee7fd..969b3c16 100644
--- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: 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 4af546d3..59edd419 100644
--- a/ci/config_tpl/juju2/bundle_tpl/heat.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/heat.yaml
@@ -3,16 +3,16 @@
       num_units: 1
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: 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 c25f309b..685ff370 100644
--- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: 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 863715d3..f2214144 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
@@ -20,7 +20,7 @@
         region: {{ os.region }}
         neutron-security-groups: true
 {% if os.beta.public_api %}
-        use-internal-endpoints: true
+        #use-internal-endpoints: true
 {% endif %}
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
index cb459cc1..cddaa2f9 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-gateway.yaml
@@ -4,7 +4,7 @@
 {% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
       bindings:
-        data: admin
+        data: admin-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
index 7eb02534..d12f3257 100644
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-ovs.yaml
@@ -4,7 +4,7 @@
 {% if opnfv.spaces_dict.data is defined %}
 {% if os.service.bindings %}
       bindings:
-        data: admin
+        data: admin-api
 {% endif %}
 {% endif %}
 {% if os.network.dpdk %}
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 e20e99a7..52f509c0 100644
--- a/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/nova-cloud-controller.yaml
@@ -3,16 +3,16 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        internal: internal
+        internal: internal-api
 {% if opnfv.spaces_dict.data is defined %}
-        admin: admin
+        admin: admin-api
 {% else %}
-        admin: internal
+        admin: internal-api
 {% endif %}
 {% if opnfv.spaces_dict.public is defined %}
-        public: public
+        public: public-api
 {% else %}
-        public: internal
+        public: internal-api
 {% endif %}
 {% endif %}
       options:
diff --git a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
index a9515202..5f8d5adc 100644
--- a/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/rabbitmq.yaml
@@ -3,7 +3,7 @@
       num_units: {{ unit_qty() }}
 {% if os.service.bindings %}
       bindings:
-        amqp: internal
+        amqp: internal-api
 {% endif %}
       options:
 {% if opnfv.storage_dict.ceph is defined %}