From 18edc25759537951d6c5cdc3575c3d1b5c0d9fbc Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 7 Oct 2016 00:03:20 -0500 Subject: fetch the correct ceilometer. Change-Id: I68bd8c58cd9424886086275664dc70110270252a Signed-off-by: Narinder Gupta --- ci/config_tpl/bundle_tpl/subordinate.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ci/config_tpl/bundle_tpl/subordinate.yaml') diff --git a/ci/config_tpl/bundle_tpl/subordinate.yaml b/ci/config_tpl/bundle_tpl/subordinate.yaml index 65e065a6..3f043dc1 100644 --- a/ci/config_tpl/bundle_tpl/subordinate.yaml +++ b/ci/config_tpl/bundle_tpl/subordinate.yaml @@ -6,7 +6,9 @@ cinder-ceph: charm: local:{{ ubuntu.release }}/cinder-ceph options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" +{% if opnfv.storage_dict.ceph is defined %} + ceph-osd-replication-count: {{ unit_ceph_qty() }} +{% endif %} {% endif %} {% if os.network.controller == 'nosdn' %} {% include 'neutron-ovs.yaml' %} @@ -19,7 +21,6 @@ openvswitch-odl: charm: local:{{ ubuntu.release }}/openvswitch-odl options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" {% if opnfv.spaces_dict.data is defined %} os-data-network: {{ opnfv.spaces_dict.data.cidr }} {% endif %} @@ -63,7 +64,6 @@ lxd: charm: local:{{ ubuntu.release }}/lxd options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" {% endif %} {% if opnfv.storage_dict.scaleio is defined %} scaleio-openstack: -- cgit 1.2.3-korg