diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-07 00:03:20 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-07 08:18:23 -0500 |
| commit | 18edc25759537951d6c5cdc3575c3d1b5c0d9fbc (patch) | |
| tree | 2bc22dd634ce127c8ac9b7094458e8c0598d7a1c /ci/config_tpl/bundle_tpl/subordinate.yaml | |
| parent | 44db065d7944b02b6948fbda4e504d6e9df0f640 (diff) | |
fetch the correct ceilometer.
Change-Id: I68bd8c58cd9424886086275664dc70110270252a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/bundle_tpl/subordinate.yaml')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/subordinate.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
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: |