updated the source for ceph deployment.

[joid.git] / 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 65e065a..1033866 100644 (file)
--- a/ci/config_tpl/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/bundle_tpl/subordinate.yaml
@@ -1,12 +1,18 @@
+
     ceilometer-agent:
       charm: local:{{ ubuntu.release }}/ceilometer-agent
       options:
         openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.beta.public_api %}
+        use-internal-endpoints: true
+{% endif %}
 {% if opnfv.storage_dict.ceph is defined %}
     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 +25,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 +68,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: