]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
added ceph.client.admin.keyring on the client to run rbd and rados tests
authortamil <tamil.muthamizhan@inktank.com>
Sat, 20 Apr 2013 01:23:54 +0000 (18:23 -0700)
committertamil <tamil.muthamizhan@inktank.com>
Sat, 20 Apr 2013 01:23:54 +0000 (18:23 -0700)
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
teuthology/task/ceph-deploy.py

index 611b270f99bb41dbf96171a86bf67d1f232804aa..b12c2788605c53b72e6f49118b98de5e41d448c5 100644 (file)
@@ -194,6 +194,7 @@ def build_ceph_cluster(ctx, config):
 
     log.info('Setting up client nodes...')
     conf_path = '/etc/ceph/ceph.conf'
+    admin_keyring_path = '/etc/ceph/ceph.client.admin.keyring'
     first_mon = teuthology.get_first_mon(ctx, config)
     (mon0_remote,) = ctx.cluster.only(first_mon).remotes.keys()
     conf_data = teuthology.get_file(
@@ -201,6 +202,11 @@ def build_ceph_cluster(ctx, config):
         path=conf_path,
         sudo=True,
         )
+    admin_keyring = teuthology.get_file(
+        remote=mon0_remote,
+        path=admin_keyring_path,
+        sudo=True,
+        )
 
     clients = ctx.cluster.only(teuthology.is_type('client'))
     for remot, roles_for_host in clients.remotes.iteritems():
@@ -235,6 +241,12 @@ def build_ceph_cluster(ctx, config):
                 data=key_data,
                 perms='0644'
             )
+            teuthology.sudo_write_file(
+                remote=remot,
+                path=admin_keyring_path,
+                data=admin_keyring,
+                perms='0644'
+            )
             teuthology.sudo_write_file(
                 remote=remot,
                 path=conf_path,