From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 7 Oct 2021 14:23:07 +0000 (+0200)
Subject: cephadm: bootstrap --apply-spec shouldn't enforce :z
X-Git-Tag: v16.2.7~67^2~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07b4ddc5158d00100d53e8761a402ad255c8c982;p=ceph.git

cephadm: bootstrap --apply-spec shouldn't enforce :z

There's no need to mount this file with the `:z` option.
read-only access is enough for this file.

Fixes: https://tracker.ceph.com/issues/52855

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit edc07019c6e70950d697ec0d7f3756065ac64b92)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 20627916844..13b19a57308 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4361,7 +4361,7 @@ def command_bootstrap(ctx):
                         out, err, code = call_throws(ctx, ['sudo', '-u', ctx.ssh_user, 'ssh-copy-id', '-f', '-i', ssh_key, '-o StrictHostKeyChecking=no', '%s@%s' % (ctx.ssh_user, split[1])])
 
         mounts = {}
-        mounts[pathify(ctx.apply_spec)] = '/tmp/spec.yml:z'
+        mounts[pathify(ctx.apply_spec)] = '/tmp/spec.yml:ro'
 
         out = cli(['orch', 'apply', '-i', '/tmp/spec.yml'], extra_mounts=mounts)
         logger.info(out)