diff options
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 2 | ||||
| -rw-r--r-- | ci/genBundle.py | 10 |
2 files changed, 5 insertions, 7 deletions
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: |