Merge lp:~vila/ubuntu-ci-services-itself/12897942-sha1-payload into lp:ubuntu-ci-services-itself

[Vincent Ladeuil]

Properly restore --reuse-payload.

/me sighs, half my kingdom for tests to avoid stupid errors like this :-/

Restoring --reuse-payload ignored the function rename breaking trunk, this fixes it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:344
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/355/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/355/rebuild

review: Approve (continuous-integration)

[Para Siva (psivaa)]

review: Approve

=== modified file 'juju-deployer/deploy.py'
--- juju-deployer/deploy.py	2014-03-10 09:02:52 +0000
+++ juju-deployer/deploy.py	2014-03-10 10:16:52 +0000
@@ -343,7 +343,7 @@
     shutil.copytree(deployer_dir, working_dir)
 
     if not args.branch_payload and not args.reuse_payload:
-        setup_swift()
+        upload_payload_to_swift()
 
     # Create .yaml files from .yaml.tmpl files.
     populate_templates(deployer_dir, working_dir)