openstack
/
openstack-helm-images
Code Issues Proposed changes

[CEPH] Build Octopus based ceph images 

This is to uplift ceph release from Nautilus to Octopus.

Change-Id: I36f54077be65741c0677d77cbbf4795db919703f
This commit is contained in:
Chinasubbareddy Mallavarapu 2021-01-04 17:42:23 +00:00 committed by chinasubbareddy mallavarapu
parent 46bf884d16
commit b379c3a272
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ceph-cephfs-provisioner/Dockerfile.ubuntu_bionic
View File

@ -1,11 +1,11 @@
ARG baseimg=docker.io/ubuntu:bionic
FROM ${baseimg}
# Nautilus 14.2.9
ARG CEPH_RELEASE=nautilus
ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
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
# Octopus 15.2.8
ARG CEPH_RELEASE=octopus
ARG CEPH_RELEASE_TAG=15.2.8-1bionic
ARG CEPH_REPO=https://download.ceph.com/debian-octopus/
ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
RUN set -ex ;\

11
ceph-config-helper/Dockerfile.ubuntu_bionic
View File

@ -4,12 +4,12 @@ FROM ${FROM}
ARG DISTRO_CODENAME='bionic'
ARG KUBE_VERSION=v1.16.2
# Nautilus 14.2.9
ARG CEPH_RELEASE=nautilus
ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
# Octopus 15.2.8
ARG CEPH_RELEASE=octopus
ARG CEPH_RELEASE_TAG=15.2.8-1bionic
ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/${DISTRO_CODENAME}/
ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/${DISTRO_CODENAME}/archive-ceph-nautilus.key
ARG CEPH_REPO=https://download.ceph.com/debian-octopus/
ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
RUN set -ex ;\
@ -34,6 +34,7 @@ RUN set -ex ;\
udev \
jq ;\
curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 ;\
pip3 --no-cache-dir install --upgrade --ignore-installed PyYAML ;\
pip3 --no-cache-dir install --upgrade \
crush \
rgwadmin \

11
ceph-daemon/Dockerfile.ubuntu_bionic
View File

@ -2,13 +2,13 @@ ARG FROM=docker.io/ubuntu:bionic
FROM ${FROM}
ARG KUBE_VERSION=1.16.2
# Nautilus 14.2.9
ARG CEPH_RELEASE=nautilus
ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
# Octopus 15.2.8
ARG CEPH_RELEASE=octopus
ARG CEPH_RELEASE_TAG=15.2.8-1bionic
ARG CONFD_VERSION=0.16.0
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://download.ceph.com/debian-octopus/
ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
RUN set -ex ;\
@ -48,6 +48,7 @@ RUN set -ex ;\
jq \
alien ;\
curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 ;\
pip3 --no-cache-dir install --upgrade --ignore-installed PyYAML ;\
pip3 --no-cache-dir install --upgrade \
six \
python-openstackclient \

11
ceph-rbd-provisioner/Dockerfile.ubuntu_bionic
View File

@ -1,11 +1,12 @@
ARG baseimg=docker.io/ubuntu:bionic
FROM ${baseimg}
# Nautilus 14.2.9
ARG CEPH_RELEASE=nautilus
ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
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
# Octopus 15.2.8
ARG CEPH_RELEASE=octopus
ARG CEPH_RELEASE_TAG=15.2.8-1bionic
ARG CEPH_REPO=https://download.ceph.com/debian-octopus/
ARG CEPH_KEY=https://download.ceph.com/keys/release.asc
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
RUN set -ex ;\