]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
Don't pass owner to copy_key()
authorZack Cerza <zack@cerza.org>
Fri, 7 Feb 2014 00:17:17 +0000 (18:17 -0600)
committerZack Cerza <zack@cerza.org>
Thu, 20 Feb 2014 23:46:06 +0000 (17:46 -0600)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/task/devstack.py

index 111c4119cb8206197ddf69a683c8b5949cd9708f..419be276fce3faf7b3d51c40ed0d2f50ed7a7600 100644 (file)
@@ -108,17 +108,23 @@ def distribute_ceph_keys(devstack_node, ceph_node):
     keys = [
         dict(name='client.glance',
              path='/etc/ceph/ceph.client.glance.keyring',
-             owner='glance:glance'),
+             # devstack appears to just want root:root
+             #owner='glance:glance',
+             ),
         dict(name='client.cinder',
              path='/etc/ceph/ceph.client.cinder.keyring',
-             owner='cinder:cinder'),
+             # devstack appears to just want root:root
+             #owner='cinder:cinder',
+             ),
         dict(name='client.cinder-backup',
              path='/etc/ceph/ceph.client.cinder-backup.keyring',
-             owner='cinder:cinder'),
+             # devstack appears to just want root:root
+             #owner='cinder:cinder',
+             ),
     ]
     for key_dict in keys:
         copy_key(ceph_node, key_dict['name'], devstack_node,
-                 key_dict['path'], key_dict['owner'])
+                 key_dict['path'], key_dict.get('owner'))
 
 
 def set_libvirt_secret(devstack_node, ceph_node):