commit 1b652264ae78e935470790c277f652b55c4e2329
author Jenkins <jenkins@review.openstack.org> Thu May 26 13:23:33 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu May 26 13:23:33 2016 +0000
tree 1886cabe3df5ab2d4d2303a45b31d7935da1da7d
parent e4d229cc6ff05bb4986b1c8b1be602cc87fcf1a9
parent 3d428d326449442e705d0ee3259acfa149528980

Merge "Ansible launcher: create parent directories for SCP"

zuul/launcher/ansiblelaunchserver.py

diff --git a/zuul/launcher/ansiblelaunchserver.py b/zuul/launcher/ansiblelaunchserver.py
index c3a5dfe..faab588 100644
--- a/zuul/launcher/ansiblelaunchserver.py
+++ b/zuul/launcher/ansiblelaunchserver.py
@@ -632,10 +632,12 @@
             if not dest.startswith(site['root']):
                 raise Exception("Target path %s is not below site root" %
                                 (dest,))
+
             local_args = [
                 'command', '/usr/bin/rsync', '--delay-updates', '-F',
-                '--compress', '-rt', '--safe-links', '--rsh',
-                '"/usr/bin/ssh -i {private_key_file} -S none '
+                '--compress', '-rt', '--safe-links',
+                '--rsync-path="mkdir -p {dest} && rsync"',
+                '--rsh="/usr/bin/ssh -i {private_key_file} -S none '
                 '-o StrictHostKeyChecking=no"',
                 '--out-format="<<CHANGED>>%i %n%L"',
                 '"{source}/"', '"{user}@{host}:{dest}"'