airship/porthole
Code Issues Proposed changes

Ceph upgrade to octopus

Browse Source 
Upgraded ceph to octopus 15.2.13-1bionic release.

Change-Id: Icb8dccb3f2f2d651b360f2d8ed05d435b287d612
This commit is contained in:
jk330k 2021-05-13 13:37:50 -05:00 committed by KAVVA
parent 94e1f3be27
commit 0816edd51d
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
images/ceph-utility/Dockerfile.ubuntu_bionic
View File

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

2
images/etcdctl-utility/Dockerfile.ubuntu_bionic
View File

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

2
images/mysqlclient-utility/Dockerfile.ubuntu_bionic
View File

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

1
images/openstack-utility/Dockerfile.ubuntu_bionic
View File

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

1
tools/deployment/010-ceph-utility.sh
View File

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