move to master branch of charm for few bug fixes.

[joid.git] / ci / config_tpl / bundle_tpl / ceph.yaml

diff --git a/ci/config_tpl/bundle_tpl/ceph.yaml b/ci/config_tpl/bundle_tpl/ceph.yaml
index 10b9684..1ed43d4 100644 (file)
--- a/ci/config_tpl/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/bundle_tpl/ceph.yaml
@@ -6,6 +6,14 @@
         monitor-count: {{ unit_ceph_qty() }}
         fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
         monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+{% if ubuntu.release == 'trusty' and os.release < 'newton' %}
+        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
+{% elif ubuntu.release == 'xenial' and os.release >= 'newton' %}
+        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
+{% endif %}
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
 {% if opnfv.spaces_dict.storage is defined %}
         #ceph-cluster-network: {{ opnfv.spaces_dict.storage.cidr }}
 {% endif %}
@@ -35,6 +43,14 @@
       options:
         osd-devices: {{ opnfv.storage_dict.ceph.disk }}
         osd-reformat: 'yes'
+{% if ubuntu.release == 'trusty' and os.release < 'newton' %}
+        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
+{% elif ubuntu.release == 'xenial' and os.release >= 'newton' %}
+        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
+{% endif %}
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
       to:
 {% if os.hyperconverged %}
 {% for unit_id in range(0, opnfv.units) %}
@@ -55,8 +71,20 @@
       charm: "local:{{ ubuntu.release }}/ceph-radosgw"
       num_units: {{ unit_qty() if os.beta.hacluster_ceph_radosgw else 1 }}
       options:
+        region: {{ os.region }}
         use-embedded-webserver: true
         operator-roles: "Member,admin"
+{% if ubuntu.release == 'trusty' and os.release < 'newton' %}
+        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
+{% elif ubuntu.release == 'xenial' and os.release >= 'newton' %}
+        source: "cloud:{{ ubuntu.release }}-updates/{{ os.release }}"
+{% endif %}
+{% if os.network.ipv6 %}
+        prefer-ipv6: {{ os.network.ipv6 }}
+{% endif %}
+{% if opnfv.storage_dict.ceph is defined %}
+        ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
       to:
 {% for unit_id in to_select(unit_qty() if os.beta.hacluster_ceph_radosgw else 1) %}
         - "lxc:nodes={{ unit_id }}"