From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Nov 2019 20:49:12 +0000 (-0600)
Subject: ceph-daemon: set container_image during bootstrap
X-Git-Tag: v15.1.0~1004^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60ddc4d97eeb8c956e9d5633c102c868b5c96e9b;p=ceph.git

ceph-daemon: set container_image during bootstrap

Set the new cluster's container_image to match the image we bootstrapped
with.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 9391b6148fc..d5332f273da 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -831,6 +831,7 @@ def command_bootstrap():
         cp.add_section('global')
     cp.set('global', 'fsid', fsid);
     cp.set('global', 'mon host', addr_arg)
+    cp.set('global', 'container_image', args.image)
     cpf = StringIO()
     cp.write(cpf)
     config = cpf.getvalue()