diff options
Diffstat (limited to 'ci/config_tpl/juju2')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml | 14 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/openbaton.yaml | 4 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml | 14 |
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" |