From 4b7f8f00919005931337d6e5d9adda7b6cbc6b27 Mon Sep 17 00:00:00 2001
From: Matthew Heler <matthew.heler@hotmail.com>
Date: Thu, 3 Jan 2019 16:26:40 -0600
Subject: [PATCH] Support the Mimic release for Ceph

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

Change-Id: I06a545c1964eaa5b983c58db48b6ad4ccaaa3b8b
---
 cinder/templates/bin/_backup-storage-init.sh.tpl | 4 ++--
 cinder/templates/bin/_storage-init.sh.tpl        | 4 ++--
 glance/templates/bin/_storage-init.sh.tpl        | 6 +++---
 tools/images/ceph-config-helper/Dockerfile       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cinder/templates/bin/_backup-storage-init.sh.tpl b/cinder/templates/bin/_backup-storage-init.sh.tpl
index 37de826d02..52c8e6bf78 100644
--- a/cinder/templates/bin/_backup-storage-init.sh.tpl
+++ b/cinder/templates/bin/_backup-storage-init.sh.tpl
@@ -34,8 +34,8 @@ elif [ "x$STORAGE_BACKEND" == "xcinder.backup.drivers.ceph" ]; then
   ceph -s
   function ensure_pool () {
     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)
-    if [[ ${test_luminous} -gt 0 ]]; then
+    local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo)
+    if [[ ${test_version} -gt 0 ]]; then
       ceph osd pool application enable $1 $3
     fi
     size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]')
diff --git a/cinder/templates/bin/_storage-init.sh.tpl b/cinder/templates/bin/_storage-init.sh.tpl
index f5b3f05e67..9288ec5fd5 100644
--- a/cinder/templates/bin/_storage-init.sh.tpl
+++ b/cinder/templates/bin/_storage-init.sh.tpl
@@ -31,8 +31,8 @@ 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_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo)
-    if [[ ${test_luminous} -gt 0 ]]; then
+    local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo)
+    if [[ ${test_version} -gt 0 ]]; then
       ceph osd pool application enable $1 $3
     fi
     size_protection=$(ceph osd pool get $1 nosizechange | cut -f2 -d: | tr -d '[:space:]')
diff --git a/glance/templates/bin/_storage-init.sh.tpl b/glance/templates/bin/_storage-init.sh.tpl
index 8315d3cd6b..4b6de3c85d 100644
--- a/glance/templates/bin/_storage-init.sh.tpl
+++ b/glance/templates/bin/_storage-init.sh.tpl
@@ -42,9 +42,9 @@ elif [ "x$STORAGE_BACKEND" == "xrbd" ]; then
   ceph -s
   function ensure_pool () {
     ceph osd pool stats "$1" || ceph osd pool create "$1" "$2"
-    local test_luminous
-    test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo)
-    if [[ ${test_luminous} -gt 0 ]]; then
+    local test_version
+    test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo)
+    if [[ ${test_version} -gt 0 ]]; then
       ceph osd pool application enable "$1" "$3"
     fi
   }
diff --git a/tools/images/ceph-config-helper/Dockerfile b/tools/images/ceph-config-helper/Dockerfile
index 47e4f5ba66..f385160af5 100644
--- a/tools/images/ceph-config-helper/Dockerfile
+++ b/tools/images/ceph-config-helper/Dockerfile
@@ -2,7 +2,7 @@ FROM docker.io/ubuntu:xenial
 MAINTAINER pete.birley@att.com
 
 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
 RUN set -ex ;\