From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 20 Oct 2016 11:23:43 +0000 (-0500)
Subject: modified to take care of all scenarios.
X-Git-Tag: danube.1.0~119^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aae355c5c32f12cc10d5b4c09d477c9203e19d05;p=joid.git

modified to take care of all scenarios.

Change-Id: I11c371117786232fd438197a714aebef1c44dd16
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

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 %}