openstack/openstack-helm
Code Issues Proposed changes

Support the Mimic release for Ceph

Browse Source 
- Change all tests to support Mimic and Luminous releases
- Update ceph-config-helper dockerfile to use Mimic Ceph binaries

Change-Id: I06a545c1964eaa5b983c58db48b6ad4ccaaa3b8b
This commit is contained in:
Matthew Heler
2019-01-03 16:26:40 -06:00
parent f546dad007
commit 4b7f8f0091
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,8 @@ elif [ "x$STORAGE_BACKEND" == "xcinder.backup.drivers.ceph" ]; then
ceph -s ceph -s
function ensure_pool () { function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2 ceph osd pool stats $1 || ceph osd pool create $1 $2
local test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo) local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo)
if [[ ${test_luminous} -gt 0 ]]; then if [[ ${test_version} -gt 0 ]]; then
ceph osd pool application enable $1 $3 ceph osd pool application enable $1 $3
fi fi
size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]') size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]')

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

@@ -31,8 +31,8 @@ if [ "x$STORAGE_BACKEND" == "xcinder.volume.drivers.rbd.RBDDriver" ]; then
ceph -s ceph -s
function ensure_pool () { function ensure_pool () {
ceph osd pool stats $1 || ceph osd pool create $1 $2 ceph osd pool stats $1 || ceph osd pool create $1 $2
local test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo) local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo)
if [[ ${test_luminous} -gt 0 ]]; then if [[ ${test_version} -gt 0 ]]; then
ceph osd pool application enable $1 $3 ceph osd pool application enable $1 $3
fi fi
size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]') size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]')

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

@@ -42,9 +42,9 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then
ceph -s ceph -s
function ensure_pool () { function ensure_pool () {
ceph osd pool stats "$1" || ceph osd pool create "$1" "$2" ceph osd pool stats "$1" || ceph osd pool create "$1" "$2"
local test_luminous local test_version
test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo) test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo)
if [[ ${test_luminous} -gt 0 ]]; then if [[ ${test_version} -gt 0 ]]; then
ceph osd pool application enable "$1" "$3" ceph osd pool application enable "$1" "$3"
fi fi
} }

2
tools/images/ceph-config-helper/Dockerfile
View File

@@ -2,7 +2,7 @@ FROM docker.io/ubuntu:xenial
MAINTAINER pete.birley@att.com MAINTAINER pete.birley@att.com
ARG KUBE_VERSION=v1.10.3 ARG KUBE_VERSION=v1.10.3
ARG CEPH_RELEASE=luminous ARG CEPH_RELEASE=mimic
ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
RUN set -ex ;\ RUN set -ex ;\