From 94a8edadc9581d3271a19a69648784aee95b3a5e Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sat, 4 Feb 2017 05:04:28 -0600 Subject: modfiied to take care of using juju 2.1-beta4. Will switch once get the final confirmation of release. Change-Id: Id5964a5fd458df9c0486051dd3c6fbbd2abaa7bd Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml | 16 ++++++++++++++++ ci/config_tpl/juju2/bundle_tpl/odl.yaml | 16 ++++++++++++++++ ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml | 16 ++++++++++++++++ ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml | 16 ++++++++++++++++ 4 files changed, 64 insertions(+) (limited to 'ci/config_tpl/juju2') diff --git a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml index 644de692..1cfa1e4f 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceilometer.yaml @@ -1,6 +1,22 @@ mongodb: charm: ./{{ ubuntu.release }}/mongodb 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 %} +{% endif %} to: - "lxd:nodes/0" ceilometer: diff --git a/ci/config_tpl/juju2/bundle_tpl/odl.yaml b/ci/config_tpl/juju2/bundle_tpl/odl.yaml index 27e22cbd..2be64b15 100644 --- a/ci/config_tpl/juju2/bundle_tpl/odl.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/odl.yaml @@ -1,6 +1,22 @@ odl-controller: charm: ./{{ ubuntu.release }}/odl-controller 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 %} +{% endif %} options: install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.5.2-Boron-SR2/distribution-karaf-0.5.2-Boron-SR2.tar.gz" {% if os.network.sfc %} diff --git a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml index aef9260b..28ad55c4 100644 --- a/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/openstack-dashboard.yaml @@ -1,6 +1,22 @@ openstack-dashboard: charm: "./{{ ubuntu.release }}/openstack-dashboard" num_units: {{ unit_qty() }} +{% 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 %} +{% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" secret: admin diff --git a/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml b/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml index d2372871..92bf37d1 100644 --- a/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/opnfv-promise.yaml @@ -1,6 +1,22 @@ opnfv-promise: charm: ./{{ ubuntu.release }}/promise 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 %} +{% endif %} to: - "lxd:nodes/0" {# Empty block to avoid bad block trim #} -- cgit 1.2.3-korg