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/glance.yaml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl/glance.yaml') diff --git a/ci/config_tpl/juju2/bundle_tpl/glance.yaml b/ci/config_tpl/juju2/bundle_tpl/glance.yaml index be80bb39..d1136446 100644 --- a/ci/config_tpl/juju2/bundle_tpl/glance.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/glance.yaml @@ -3,23 +3,21 @@ num_units: {{ unit_qty() }} {% 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 + worker-multiplier: *worker-multiplier + region: *openstack-region +{% if os.beta.public_api %} + use-internal-endpoints: True +{% endif %} {% if os.git_repo.origin_git %} openstack-origin-git: "{{ os.git_repo.branch }}" -{% endif %} - region: {{ os.region }} -{% if os.beta.public_api %} - use-internal-endpoints: true {% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} @@ -27,9 +25,6 @@ {% if opnfv.storage_dict.ceph is defined %} ceph-osd-replication-count: {{ unit_ceph_qty() }} {% endif %} -{% if os.api.worker_multiplier %} - worker-multiplier: {{ os.api.worker_multiplier }} -{% endif %} {% if os.ha.mode == 'ha' %} vip: {{ opnfv.vip.glance }} {% endif %} -- cgit 1.2.3-korg