From d03a8a1a226a7d3d73cea6be79aec8c99492d13f Mon Sep 17 00:00:00 2001 From: Chinasubbareddy Mallavarapu Date: Wed, 11 Dec 2019 17:12:09 -0600 Subject: [PATCH] Support the Nautilus release for Ceph - Change all tests to support Nautilus,Mimic and Luminous releases - Update ceph-config-helper image Change-Id: I557b1efa12529d0ee51d4c5b9d4beb4abf1b0574 --- cinder/templates/bin/_backup-storage-init.sh.tpl | 2 +- cinder/templates/bin/_storage-init.sh.tpl | 2 +- cinder/values.yaml | 4 ++-- glance/templates/bin/_storage-init.sh.tpl | 2 +- glance/values.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cinder/templates/bin/_backup-storage-init.sh.tpl b/cinder/templates/bin/_backup-storage-init.sh.tpl index 10069f17f8..6ab392d746 100644 --- a/cinder/templates/bin/_backup-storage-init.sh.tpl +++ b/cinder/templates/bin/_backup-storage-init.sh.tpl @@ -34,7 +34,7 @@ elif [[ $STORAGE_BACKEND =~ 'cinder.backup.drivers.ceph' ]]; then ceph -s function ensure_pool () { ceph osd pool stats $1 || ceph osd pool create $1 $2 - local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo) + local test_version=$(ceph tell osd.* version | egrep -c "nautilus|mimic|luminous" | xargs echo) if [[ ${test_version} -gt 0 ]]; then ceph osd pool application enable $1 $3 fi diff --git a/cinder/templates/bin/_storage-init.sh.tpl b/cinder/templates/bin/_storage-init.sh.tpl index bbc3193889..b1d11b2007 100644 --- a/cinder/templates/bin/_storage-init.sh.tpl +++ b/cinder/templates/bin/_storage-init.sh.tpl @@ -31,7 +31,7 @@ if [ "x$STORAGE_BACKEND" == "xcinder.volume.drivers.rbd.RBDDriver" ]; then ceph -s function ensure_pool () { ceph osd pool stats $1 || ceph osd pool create $1 $2 - local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo) + local test_version=$(ceph tell osd.* version | egrep -c "nautilus|mimic|luminous" | xargs echo) if [[ ${test_version} -gt 0 ]]; then ceph osd pool application enable $1 $3 fi diff --git a/cinder/values.yaml b/cinder/values.yaml index c1b85bc7d5..8f472bffda 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -56,9 +56,9 @@ images: cinder_scheduler: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial cinder_volume: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial cinder_volume_usage_audit: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial - cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial + cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216 cinder_backup: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial - cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial + cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/glance/templates/bin/_storage-init.sh.tpl b/glance/templates/bin/_storage-init.sh.tpl index 5a9c25f398..e85a865e2c 100644 --- a/glance/templates/bin/_storage-init.sh.tpl +++ b/glance/templates/bin/_storage-init.sh.tpl @@ -43,7 +43,7 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then function ensure_pool () { ceph osd pool stats "$1" || ceph osd pool create "$1" "$2" local test_version - test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo) + test_version=$(ceph tell osd.* version | egrep -c "nautilus|mimic|luminous" | xargs echo) if [[ ${test_version} -gt 0 ]]; then ceph osd pool application enable "$1" "$3" fi diff --git a/glance/values.yaml b/glance/values.yaml index 767ce35943..075d01ee7a 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -39,7 +39,7 @@ release_group: null images: tags: test: docker.io/xrally/xrally-openstack:1.3.0 - glance_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial + glance_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216 glance_metadefs_load: docker.io/openstackhelm/glance:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial glance_db_sync: docker.io/openstackhelm/glance:ocata-ubuntu_xenial