ceph-daemon: use client.admin keyring during bootstrap

It's usually okay to use the mon. key for CLI commands, except we had a
mgr but that prevented you from issuing mgr commands correctly.  We have
the new client.admin key available, so use that instead.

Update tests to not --skip-ssh (now that it doesn't hang).

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

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index 80640704272f59e3b148e2760fde4d983675defd..5705664e3a87469b67a9d1de0450de2aef4d982b 100755 (executable)
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -70,8 +70,7 @@ $SUDO $CEPH_DAEMON --image $IMAGE bootstrap \
       --fsid $FSID \
       --config $ORIG_CONFIG \
       --output-config $CONFIG \
-      --output-keyring $KEYRING \
-      --skip-ssh
+      --output-keyring $KEYRING
 test -e $CONFIG
 test -e $KEYRING
 rm -f $ORIG_CONFIG

diff --git a/src/ceph-daemon b/src/ceph-daemon
index c810406f8dfd1b419302a04cf9cd9ce144d94cb3..a2ed360964caeaf0be821c14805848319c5951da 100755 (executable)
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -841,11 +841,11 @@ def command_bootstrap():
                % (mon_key, admin_key, mgr_id, mgr_key, hostname, crash_key))
 
     # tmp keyring file
-    tmp_keyring = tempfile.NamedTemporaryFile(mode='w')
-    os.fchmod(tmp_keyring.fileno(), 0o600)
-    os.fchown(tmp_keyring.fileno(), uid, gid)
-    tmp_keyring.write(keyring)
-    tmp_keyring.flush()
+    tmp_bootstrap_keyring = tempfile.NamedTemporaryFile(mode='w')
+    os.fchmod(tmp_bootstrap_keyring.fileno(), 0o600)
+    os.fchown(tmp_bootstrap_keyring.fileno(), uid, gid)
+    tmp_bootstrap_keyring.write(keyring)
+    tmp_bootstrap_keyring.flush()
 
     # create initial monmap, tmp monmap file
     logger.info('Creating initial monmap...')
@@ -883,7 +883,7 @@ def command_bootstrap():
         volume_mounts={
             log_dir: '/var/log/ceph:z',
             mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
-            tmp_keyring.name: '/tmp/keyring:z',
+            tmp_bootstrap_keyring.name: '/tmp/keyring:z',
             tmp_monmap.name: '/tmp/monmap:z',
         },
     ).run()
@@ -896,18 +896,31 @@ def command_bootstrap():
     mon_c = get_container(fsid, 'mon', mon_id)
     deploy_daemon_units(fsid, uid, gid, 'mon', mon_id, mon_c)
 
+    # client.admin key + config to issue various CLI commands
+    tmp_admin_keyring = tempfile.NamedTemporaryFile(mode='w')
+    os.fchmod(tmp_admin_keyring.fileno(), 0o600)
+    os.fchown(tmp_admin_keyring.fileno(), uid, gid)
+    tmp_admin_keyring.write('[client.admin]\n'
+                      '\tkey = ' + admin_key + '\n')
+    tmp_admin_keyring.flush()
+
+    tmp_config = tempfile.NamedTemporaryFile(mode='w')
+    os.fchmod(tmp_config.fileno(), 0o600)
+    os.fchown(tmp_config.fileno(), uid, gid)
+    tmp_config.write(config)
+    tmp_config.flush()
+
     logger.info('Waiting for mon to start...')
     while True:
         c = CephContainer(
             image=args.image,
             entrypoint='/usr/bin/ceph',
             args=[
-                '-n', 'mon.',
-                '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
                 'status'],
             volume_mounts={
                 mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
             },
         )
         out, err, ret = call(c.run_cmd(), c.entrypoint)
@@ -922,27 +935,27 @@ def command_bootstrap():
         out = CephContainer(
             image=args.image,
             entrypoint='/usr/bin/ceph',
-            args=['-n', 'mon.',
-                  '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
-                  '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                  'config', 'assimilate-conf',
+            args=['config', 'assimilate-conf',
                   '-i', '/var/lib/ceph/mon/ceph-%s/config' % mon_id],
             volume_mounts={
                 log_dir: '/var/log/ceph:z',
-                mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % mon_id},
+                mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % mon_id,
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
+            },
         ).run()
         logger.info('Generating new minimal ceph.conf...')
         out = CephContainer(
             image=args.image,
             entrypoint='/usr/bin/ceph',
-            args=['-n', 'mon.',
-                  '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
-                  '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                  'config', 'generate-minimal-conf',
-                '-o', '/var/lib/ceph/mon/ceph-%s/config' % mon_id],
+            args=['config', 'generate-minimal-conf',
+                  '-o', '/var/lib/ceph/mon/ceph-%s/config' % mon_id],
             volume_mounts={
                 log_dir: '/var/log/ceph:z',
-                mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % mon_id},
+                mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % mon_id,
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
+            },
         ).run()
         # re-read our minimized config
         with open(mon_dir + '/config', 'r') as f:
@@ -983,12 +996,11 @@ def command_bootstrap():
             image=args.image,
             entrypoint='/usr/bin/ceph',
             args=[
-                '-n', 'mon.',
-                '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
                 'status', '-f', 'json-pretty'],
             volume_mounts={
                 mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
             },
         ).run()
         j = json.loads(out)
@@ -1022,9 +1034,6 @@ def command_bootstrap():
             image=args.image,
             entrypoint='/usr/bin/ceph',
             args=[
-                '-n', 'mon.',
-                '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
                 'config-key',
                 'set',
                 'mgr/ssh/ssh_identity_key',
@@ -1032,15 +1041,14 @@ def command_bootstrap():
             volume_mounts={
                 mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
                 tmp_key.name: '/tmp/key:z',
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
             },
         ).run()
         CephContainer(
             image=args.image,
             entrypoint='/usr/bin/ceph',
             args=[
-                '-n', 'mon.',
-                '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
                 'config-key',
                 'set',
                 'mgr/ssh/ssh_identity_pub',
@@ -1048,6 +1056,8 @@ def command_bootstrap():
             volume_mounts={
                 mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
                 tmp_pub.name: '/tmp/pub:z',
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
             },
         ).run()
 
@@ -1061,14 +1071,13 @@ def command_bootstrap():
             image=args.image,
             entrypoint='/usr/bin/ceph',
             args=[
-                '-n', 'mon.',
-                '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
                 'mgr', 'module', 'enable', 'ssh'
             ],
             volume_mounts={
                 mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
                 tmp_pub.name: '/tmp/pub:z',
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
             },
         ).run()
         logger.info('Setting orchestrator backend to ssh...')
@@ -1076,14 +1085,14 @@ def command_bootstrap():
             image=args.image,
             entrypoint='/usr/bin/ceph',
             args=[
-                '-n', 'mon.',
-                '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
                 'orchestrator', 'set', 'backend', 'ssh'
             ],
             volume_mounts={
                 mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
+                log_dir: '/var/log/ceph:z',
                 tmp_pub.name: '/tmp/pub:z',
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
             },
         ).run()
         host = get_hostname()
@@ -1092,14 +1101,13 @@ def command_bootstrap():
             image=args.image,
             entrypoint='/usr/bin/ceph',
             args=[
-                '-n', 'mon.',
-                '-k', '/var/lib/ceph/mon/ceph-%s/keyring' % mon_id,
-                '-c', '/var/lib/ceph/mon/ceph-%s/config' % mon_id,
                 'orchestrator', 'host', 'add', host
             ],
             volume_mounts={
                 mon_dir: '/var/lib/ceph/mon/ceph-%s:z' % (mon_id),
                 tmp_pub.name: '/tmp/pub:z',
+                tmp_admin_keyring.name: '/etc/ceph/ceph.client.admin.keyring:z',
+                tmp_config.name: '/etc/ceph/ceph.conf:z',
             },
         ).run()
 

diff --git a/test_ceph_daemon.sh b/test_ceph_daemon.sh
index 2d82b556e0ad059ece5038b4012524f70f7b3299..edece49e682d2ef2aa597202c75dba12df0ea78c 100755 (executable)
--- a/test_ceph_daemon.sh
+++ b/test_ceph_daemon.sh
@@ -22,8 +22,7 @@ EOF
     --mon-ip $ip \
     --config c \
     --output-keyring k \
-    --output-config c \
-    --skip-ssh
+    --output-config c
 chmod 644 k c
 
 if [ -n "$ip2" ]; then