diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-20 06:23:43 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-20 06:23:43 -0500 |
| commit | aae355c5c32f12cc10d5b4c09d477c9203e19d05 (patch) | |
| tree | 19f1ef92dbd7c439c1dda6a2076899391e0d13f7 /ci/config_tpl | |
| parent | d80e9475b6478b8697b36c94d61a1cde29620c6d (diff) | |
modified to take care of all scenarios.
Change-Id: I11c371117786232fd438197a714aebef1c44dd16
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/ceph.yaml | 12 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/ci/config_tpl/bundle_tpl/ceph.yaml b/ci/config_tpl/bundle_tpl/ceph.yaml index 35b29a8d..1ed43d4e 100644 --- a/ci/config_tpl/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/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 %} 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 %} |