]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: bootstrap --apply-spec shouldn't enforce :z
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 7 Oct 2021 14:23:07 +0000 (16:23 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 2 Nov 2021 09:01:20 +0000 (10:01 +0100)
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)

src/cephadm/cephadm

index 20627916844c16f2173aea9d34e74597f588b515..13b19a57308b0c9581a535f58b9fb0a6cb928b63 100755 (executable)
@@ -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)