From: Varsha Rao <varao@redhat.com>
Date: Tue, 14 Jul 2020 10:26:07 +0000 (+0530)
Subject: vstart: Remove old ceph images if new cluster is deployed
X-Git-Tag: v16.1.0~1653^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8c6e0d97b20be8a0feb53ecaaee0caf16c812ff;p=ceph.git

vstart: Remove old ceph images if new cluster is deployed

Signed-off-by: Varsha Rao <varao@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index d1f4a7b16b6e..f242aafedfdc 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -971,6 +971,12 @@ EOF
 
     if [ "$cephadm" -eq 1 ]; then
         debug echo Enabling cephadm orchestrator
+	if [ "$new" -eq 1 ]; then
+		digest=$(curl -s \
+		https://registry.hub.docker.com/v2/repositories/ceph/daemon-base/tags/latest-master-devel \
+		| jq -r '.images[].digest')
+		ceph_adm config set global container_image "docker.io/ceph/daemon-base@$digest"
+	fi
         ceph_adm config-key set mgr/cephadm/ssh_identity_key -i ~/.ssh/id_rsa
         ceph_adm config-key set mgr/cephadm/ssh_identity_pub -i ~/.ssh/id_rsa.pub
         ceph_adm mgr module enable cephadm