From bfa78bf03f5cc1b2d6c32461b538eb7cc1e4a1f3 Mon Sep 17 00:00:00 2001
From: Matthew Heler <matthew.heler@hotmail.com>
Date: Thu, 28 Feb 2019 19:40:39 -0600
Subject: [PATCH] [CEPH] Update the Ceph repo and key to be arguements

Change-Id: Iee93e5a4d542b69bf6ebfbc82920b132a2af7778
---
 ceph-config-helper/Dockerfile.ubuntu_xenial | 11 +++++++----
 ceph-daemon/Dockerfile.ubuntu_xenial        | 11 +++++++----
 ceph-utility/Dockerfile.ubuntu_xenial       |  7 +++++--
 libvirt/Dockerfile.ubuntu_xenial            | 11 +++++++----
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/ceph-config-helper/Dockerfile.ubuntu_xenial b/ceph-config-helper/Dockerfile.ubuntu_xenial
index c88a5454..7239e40e 100644
--- a/ceph-config-helper/Dockerfile.ubuntu_xenial
+++ b/ceph-config-helper/Dockerfile.ubuntu_xenial
@@ -4,12 +4,15 @@ FROM ${FROM}
 ARG KUBE_VERSION=v1.10.3
 ARG CEPH_RELEASE=mimic
 
-ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
+ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
+ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
+
+ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -ex ;\
     export DEBIAN_FRONTEND=noninteractive ;\
-    apt-key add /etc/apt/ceph-release.asc ;\
-    rm -f /etc/apt/ceph-release.asc ;\
-    echo deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list ;\
+    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+    echo deb ${CEPH_REPO} xenial main | tee /etc/apt/sources.list.d/ceph.list ;\
     TMP_DIR=$(mktemp --directory) ;\
     cd ${TMP_DIR} ;\
     apt-get update ;\
diff --git a/ceph-daemon/Dockerfile.ubuntu_xenial b/ceph-daemon/Dockerfile.ubuntu_xenial
index e7327724..878fbb69 100644
--- a/ceph-daemon/Dockerfile.ubuntu_xenial
+++ b/ceph-daemon/Dockerfile.ubuntu_xenial
@@ -7,12 +7,15 @@ ARG CEPH_RELEASE=mimic
 ARG ETCDCTL_VERSION=3.2.18
 ARG CONFD_VERSION=0.16.0
 
-ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
+ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
+ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
+
+ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -ex ;\
     export DEBIAN_FRONTEND=noninteractive ;\
-    apt-key add /etc/apt/ceph-release.asc ;\
-    rm -f /etc/apt/ceph-release.asc ;\
-    echo "deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
+    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+    echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
     TMP_DIR=$(mktemp --directory) ;\
     cd ${TMP_DIR} ;\
     apt-get update ;\
diff --git a/ceph-utility/Dockerfile.ubuntu_xenial b/ceph-utility/Dockerfile.ubuntu_xenial
index d0681ed8..79042f30 100644
--- a/ceph-utility/Dockerfile.ubuntu_xenial
+++ b/ceph-utility/Dockerfile.ubuntu_xenial
@@ -4,14 +4,17 @@ FROM ${FROM}
 ARG CEPH_RELEASE=mimic
 ARG KUBE_VERSION=1.12.2
 
+ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
+ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
+
 RUN set -xe \
     && export DEBIAN_FRONTEND=noninteractive \
     && sed -i '/nobody/d' /etc/passwd \
     && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
     && apt-get update && apt-get dist-upgrade -y \
     && apt-get install -y wget curl apt-transport-https ca-certificates gnupg\
-    && wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - \
-    && echo deb https://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list \
+    && wget -q -O- ${CEPH_KEY} | apt-key add - \
+    && echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list \
     && apt-get update && apt-get install -y bash python-oslo.rootwrap moreutils vim sudo screen ceph ceph-common python-rbd radosgw hexedit jq s3cmd rsyslog rsync xz-utils iperf \
     && apt-get remove --purge -y wget apt-transport-https && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && TMP_DIR=$(mktemp --directory) \
diff --git a/libvirt/Dockerfile.ubuntu_xenial b/libvirt/Dockerfile.ubuntu_xenial
index 0284028c..6e88a7a7 100644
--- a/libvirt/Dockerfile.ubuntu_xenial
+++ b/libvirt/Dockerfile.ubuntu_xenial
@@ -7,12 +7,15 @@ ARG PROJECT=nova
 ARG UID=42424
 ARG GID=42424
 
-ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
+ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
+ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
+
+ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
 RUN set -ex ;\
     export DEBIAN_FRONTEND=noninteractive ;\
-    apt-key add /etc/apt/ceph-release.asc ;\
-    rm -f /etc/apt/ceph-release.asc ;\
-    echo "deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
+    apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+    rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
+    echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
     apt-get update ;\
     apt-get upgrade -y ;\
     apt-get install --no-install-recommends -y \