openstack
/
openstack-helm
Code Issues Proposed changes

Merge "Ceph: fix logic for check ceph version"

This commit is contained in:
Zuul 2018-01-17 16:41:53 +00:00 committed by Gerrit Code Review
parent 2fc1a5f812 96610abac1
commit 44194a9291
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/values.yaml
View File

@ -312,7 +312,7 @@ bootstrap:
function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2
local test_luminous=$(ceph -v | egrep -q "12.2|luminous"; echo $?)
if [[ ${test_luminous} -ne 0 ]]; then
if [[ ${test_luminous} -eq 0 ]]; then
ceph osd pool application enable $1 $3
fi
}

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

@ -35,7 +35,7 @@ elif [ "x$STORAGE_BACKEND" == "xcinder.backup.drivers.ceph" ]; then
function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2
local test_luminous=$(ceph -v | egrep -q "12.2|luminous"; echo $?)
if [[ ${test_luminous} -ne 0 ]]; then
if [[ ${test_luminous} -eq 0 ]]; then
ceph osd pool application enable $1 $3
fi
}

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

@ -32,7 +32,7 @@ if [ "x$STORAGE_BACKEND" == "xcinder.volume.drivers.rbd.RBDDriver" ]; then
function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2
local test_luminous=$(ceph -v | egrep -q "12.2|luminous"; echo $?)
if [[ ${test_luminous} -ne 0 ]]; then
if [[ ${test_luminous} -eq 0 ]]; then
ceph osd pool application enable $1 $3
fi
}

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

@ -34,7 +34,7 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then
function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2
local test_luminous=$(ceph -v | egrep -q "12.2|luminous"; echo $?)
if [[ ${test_luminous} -ne 0 ]]; then
if [[ ${test_luminous} -eq 0 ]]; then
ceph osd pool application enable $1 $3
fi
}

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

@ -29,7 +29,7 @@ ceph -s
function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2
local test_luminous=$(ceph -v | egrep -q "12.2|luminous"; echo $?)
if [[ ${test_luminous} -ne 0 ]]; then
if [[ ${test_luminous} -eq 0 ]]; then
ceph osd pool application enable $1 $3
fi
}