From e9a56336b664f4575194c2317aa747652a2ecb6f Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 15 Aug 2017 13:28:22 -0500 Subject: modified templates and added variable to easlity understand the templates and added support for multiple networks. Change-Id: I1074c722c9007bd12c711dbfc58afa1a098d2a17 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/cinder.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl/cinder.yaml') diff --git a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml index cce12e01..28b72227 100644 --- a/ci/config_tpl/juju2/bundle_tpl/cinder.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/cinder.yaml @@ -7,31 +7,28 @@ {% endif %} {% if os.service.bindings %} bindings: - internal: internal-api - admin: internal-api - shared-db: internal-api -{% if opnfv.spaces_dict.public is defined %} - public: public-api -{% else %} - public: internal-api -{% endif %} + "": *oam-space + public: *public-space + admin: *admin-space + internal: *internal-space + shared-db: *internal-space {% endif %} options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" + openstack-origin: *openstack-origin {% if os.git_repo.origin_git %} openstack-origin-git: "{{ os.git_repo.branch }}" {% endif %} - region: {{ os.region }} + region: *openstack-region block-device: None glance-api-version: 2 {% if os.beta.public_api %} - use-internal-endpoints: true + use-internal-endpoints: True {% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} {% if os.api.worker_multiplier %} - worker-multiplier: {{ os.api.worker_multiplier }} + worker-multiplier: *worker-multiplier {% endif %} {% if opnfv.storage_dict.ceph is defined %} ceph-osd-replication-count: {{ unit_ceph_qty() }} -- cgit 1.2.3-korg