]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
cluster: add owner argument to write_file 366/head
authorLoic Dachary <ldachary@redhat.com>
Sat, 22 Nov 2014 13:51:56 +0000 (14:51 +0100)
committerLoic Dachary <ldachary@redhat.com>
Sat, 22 Nov 2014 13:51:56 +0000 (14:51 +0100)
The misc.sudo_write_file now supports the optional owner argument, add
support for it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
teuthology/orchestra/cluster.py

index 22490c3ecddac17787a034b2f6da448852462a89..36febec9c41e386be031e9e20d52fe548af8f0c9 100644 (file)
@@ -63,7 +63,7 @@ class Cluster(object):
         remotes = sorted(self.remotes.iterkeys(), key=lambda rem: rem.name)
         return [remote.run(**kwargs) for remote in remotes]
 
-    def write_file(self, file_name, content, sudo=False, perms=None):
+    def write_file(self, file_name, content, sudo=False, perms=None, owner=None):
         """
         Write text to a file on each node.
 
@@ -75,10 +75,10 @@ class Cluster(object):
         remotes = sorted(self.remotes.iterkeys(), key=lambda rem: rem.name)
         for remote in remotes:
             if sudo:
-                teuthology.misc.sudo_write_file(remote, file_name, content, perms)
+                teuthology.misc.sudo_write_file(remote, file_name, content, perms=perms, owner=owner)
             else:
-                if perms is not None:
-                    raise ValueError("To specify perms, sudo must be True")
+                if perms is not None or owner is not None:
+                    raise ValueError("To specify perms or owner, sudo must be True")
                 teuthology.misc.write_file(remote, file_name, content)
 
     def only(self, *roles):