diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-20 11:25:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-20 11:25:05 +0000 |
| commit | 20d6606f935dd78017de5deba6584ca27e24f694 (patch) | |
| tree | deb81f899674d32f992d64d31ec00c4e5d38273a /ci/config_tpl/juju2/bundle_tpl | |
| parent | 357e2d4813865b7b99cb97ebc53efeb7ba6d759b (diff) | |
| parent | aae355c5c32f12cc10d5b4c09d477c9203e19d05 (diff) | |
Merge "modified to take care of all scenarios."
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index 8a1cf50b..412b9667 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -6,7 +6,11 @@ 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 %} @@ -39,7 +43,11 @@ 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 %} @@ -66,7 +74,11 @@ 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 %} |