From 0816edd51d7c20a7c750e4d8b27d615e4e75ac28 Mon Sep 17 00:00:00 2001
From: jk330k <jk330k@att.com>
Date: Thu, 13 May 2021 13:37:50 -0500
Subject: [PATCH] Ceph upgrade to octopus

Upgraded ceph to octopus 15.2.13-1bionic release.

Change-Id: Icb8dccb3f2f2d651b360f2d8ed05d435b287d612
---
 images/ceph-utility/Dockerfile.ubuntu_bionic        | 11 ++++++-----
 images/etcdctl-utility/Dockerfile.ubuntu_bionic     |  2 ++
 images/mysqlclient-utility/Dockerfile.ubuntu_bionic |  2 ++
 images/openstack-utility/Dockerfile.ubuntu_bionic   |  1 +
 tools/deployment/010-ceph-utility.sh                |  1 +
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/images/ceph-utility/Dockerfile.ubuntu_bionic b/images/ceph-utility/Dockerfile.ubuntu_bionic
index d0863a01..428e70d3 100755
--- a/images/ceph-utility/Dockerfile.ubuntu_bionic
+++ b/images/ceph-utility/Dockerfile.ubuntu_bionic
@@ -8,13 +8,13 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
       org.opencontainers.image.vendor='The Airship Authors' \
       org.opencontainers.image.licenses='Apache-2.0'
 
-# Nautilus 14.2.10
-ARG CEPH_RELEASE=nautilus
-ARG CEPH_RELEASE_TAG=14.2.10-1.0~bionic
+# octopus 15.2.13-1bionic
+ARG CEPH_RELEASE=octopus
+ARG CEPH_RELEASE_TAG=15.2.13-1bionic
 ARG KUBE_VERSION=1.18.6
 
-ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/
-ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key
+ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-octopus/
+ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-octopus/release.asc
 
 ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -xe \
@@ -46,6 +46,7 @@ RUN set -xe \
            iperf \
            python3.6 \
            python3-pip \
+    && pip3 install --upgrade pip \
     && pip3 install \
            oslo.rootwrap==5.8.0 \
     && apt-get remove --purge -y wget apt-transport-https \
diff --git a/images/etcdctl-utility/Dockerfile.ubuntu_bionic b/images/etcdctl-utility/Dockerfile.ubuntu_bionic
index e98680bd..501d0da3 100644
--- a/images/etcdctl-utility/Dockerfile.ubuntu_bionic
+++ b/images/etcdctl-utility/Dockerfile.ubuntu_bionic
@@ -33,6 +33,8 @@ RUN set -xe \
        python3.6 \
        python3-pip \
        jq \
+       rclone \
+    && pip3 install --upgrade pip \
     && pip3 install \
          oslo.rootwrap==5.8.0 \
          python-openstackclient==3.18.1 \
diff --git a/images/mysqlclient-utility/Dockerfile.ubuntu_bionic b/images/mysqlclient-utility/Dockerfile.ubuntu_bionic
index 3d62882c..f8849a00 100644
--- a/images/mysqlclient-utility/Dockerfile.ubuntu_bionic
+++ b/images/mysqlclient-utility/Dockerfile.ubuntu_bionic
@@ -28,6 +28,8 @@ RUN set -xe \
        python3.6 \
        python3-pip \
        jq \
+       rclone \
+    && pip3 install --upgrade pip \
     && pip3 install \
          oslo.rootwrap==5.8.0 \
          python-openstackclient==4.0.1 \
diff --git a/images/openstack-utility/Dockerfile.ubuntu_bionic b/images/openstack-utility/Dockerfile.ubuntu_bionic
index 939b2b65..73fcc6de 100755
--- a/images/openstack-utility/Dockerfile.ubuntu_bionic
+++ b/images/openstack-utility/Dockerfile.ubuntu_bionic
@@ -20,6 +20,7 @@ RUN set -xe \
        rsyslog \
        python3.6 \
        python3-pip \
+    && pip3 install --upgrade pip \
     && pip3 install \
          oslo.rootwrap==5.8.0 \
          python-openstackclient==4.0.1 \
diff --git a/tools/deployment/010-ceph-utility.sh b/tools/deployment/010-ceph-utility.sh
index cb280945..387071eb 100755
--- a/tools/deployment/010-ceph-utility.sh
+++ b/tools/deployment/010-ceph-utility.sh
@@ -27,6 +27,7 @@ deployment:
   ceph: false
   rbd_provisioner: false
   cephfs_provisioner: false
+  csi_rbd_provisioner: false
   client_secrets: true
   rgw_keystone_user_and_endpoints: false
 bootstrap: