From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 4 Jun 2018 20:23:00 +0000 (-0500)
Subject: modified to change the config option for potential data loss.
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aead85544e673a8ccae4e5ae13edd71a918b17a7;p=joid.git

modified to change the config option for potential data loss.

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

diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
index 10968154..180e0490 100644
--- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml
@@ -48,7 +48,7 @@
       options:
         osd-devices: *osd-devices
         osd-journal: *osd-journal
-        osd-reformat: 'True'
+        #osd-reformat: 'True'
         source: *openstack-origin
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
diff --git a/ci/genBundle.py b/ci/genBundle.py
index de0f879e..3df31776 100644
--- a/ci/genBundle.py
+++ b/ci/genBundle.py
@@ -200,16 +200,14 @@ if 'radosgwcluster' in extra:
 if 'hugepages' in extra:
     config['os']['beta']['huge_pages'] = True
     config['os']['beta']['cpu_pin'] = True
-if 'ocata' in extra:
-    config['os']['release'] = 'ocata'
 if 'pike' in extra:
     config['os']['release'] = 'pike'
-if 'trusty' in extra:
-    config['ubuntu']['release'] = 'trusty'
-    if 'ocata' in extra:
-        config['os']['release'] = 'mitaka'
 if 'xenial' in extra:
     config['ubuntu']['release'] = 'xenial'
+if 'bionic' in extra:
+    config['ubuntu']['release'] = 'bionic'
+    if 'pike' in extra:
+        config['os']['release'] = 'queens'
 if 'dishypcon' in extra:
     config['os']['hyperconverged'] = False
 if 'openbaton' in features: