From df92ad485163c64e0dfaba122e6ab02f2473b685 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Sun, 5 Feb 2017 05:09:15 -0600
Subject: modified to use the default binding in case no binding for those
 service containers.

Change-Id: I794a186669c093d25a4b14806d86fa5f05558964
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---
 ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml    | 14 +-------------
 ci/config_tpl/juju2/bundle_tpl/openbaton.yaml     |  4 ++++
 ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml | 14 +-------------
 3 files changed, 6 insertions(+), 26 deletions(-)

(limited to 'ci')

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
index 1cfa1e4f..528d605a 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml
@@ -3,19 +3,7 @@
       num_units: 1
 {% 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
-{% endif %}
+        "": internal-api
 {% endif %}
       to:
         - "lxd:nodes/0"
diff --git a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
index a50c242e..77318384 100644
--- a/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/openbaton.yaml
@@ -1,6 +1,10 @@
     openbaton:
       charm: "./trusty/openbaton"
       num_units: 1
+{% if os.service.bindings %}
+      bindings:
+        "": internal-api
+{% endif %}
       to:
         - "lxd:nodes/0"
 {# Empty block to avoid bad block trim #}
diff --git a/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml b/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml
index 92bf37d1..f4abaabf 100644
--- a/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml
@@ -3,19 +3,7 @@
       num_units: 1
 {% 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
-{% endif %}
+        "": internal-api
 {% endif %}
       to:
         - "lxd:nodes/0"
-- 
cgit 1.2.3-korg