openstack/openstack-helm
Code Issues Proposed changes

Support the Nautilus release for Ceph

Browse Source 
- Change all tests to support Nautilus,Mimic and Luminous releases
- Update ceph-config-helper image

Change-Id: I557b1efa12529d0ee51d4c5b9d4beb4abf1b0574
This commit is contained in:
Chinasubbareddy Mallavarapu 2019-12-11 17:12:09 -06:00 committed by chinasubbareddy mallavarapu
parent 97ac0575ba
commit d03a8a1a22
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/templates/bin/_backup-storage-init.sh.tpl
View File

@ -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

2
cinder/templates/bin/_storage-init.sh.tpl
View File

@ -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

4
cinder/values.yaml
View File

@ -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"

2
glance/templates/bin/_storage-init.sh.tpl
View File

@ -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

2
glance/values.yaml
View File

@ -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