summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-02-05 05:09:15 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-02-05 05:09:58 -0600
commitdf92ad485163c64e0dfaba122e6ab02f2473b685 (patch)
tree38d7033283835d5c0d6e43261c08686483c64858
parentf17514e7302e486499bbb7e0d51a313f78b159c1 (diff)
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>
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml14
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/openbaton.yaml4
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml14
3 files changed, 6 insertions, 26 deletions
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"