Merge lp:~cprov/adt-cloud-worker/die-py2-die into lp:adt-cloud-worker

[Celso Providelo]

Several tweaks that definitely break py2 support:

Adding missing python-keystoneclient for dealing with 2.0 swift API
Adding missing test_requirements.txt (mentioned in the doc).
Reading tarball as binary before swift upload, py3 is less tolerant to stupidness.

The main reason for doing that is the fact that `python-configparser` (a brute-force py2 backport of the py3 configparser module) breaks `virtualenv -p python3`, i.e., we can't have both working with the same codebase. So die py2 die ...

The charm has to be fixed to support installing deps from pip before it lands on trunk.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM, but will conflict with trunk, where test_requirements.txt has already been added.

review: Approve

[lp:~cprov/adt-cloud-worker/die-py2-die]

13. By Celso Providelo on 2015-03-05

merge trunk

=== modified file 'README.rst'
--- README.rst	2015-03-04 20:20:21 +0000
+++ README.rst	2015-03-05 01:24:28 +0000
@@ -16,6 +16,10 @@
 Install the Service
 ========================
 
+Install system dependencies::
+
+  $ sudo apt-get install python3-dev
+
 Build and activate a virtualenv with python3::
 
   $ virtualenv -p python3 --system-site-packages ve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-04 20:20:21 +0000
+++ adt_cloud_worker/__init__.py	2015-03-05 01:24:28 +0000
@@ -72,7 +72,8 @@
             # Run `adt-run`.
             adt_kwargs = body.copy()
             adt_kwargs['result_dir'] = result_dir
-            adt_kwargs['nova_extra_args'] = self.config.get('nova', 'extra_args').split()
+            adt_kwargs['nova_extra_args'] = self.config.get(
+                'nova', 'extra_args').split()
             arguments = _make_adt_argument_list(adt_kwargs)
 
             body['exit_code'] = run_adt(arguments)
@@ -96,7 +97,7 @@
                     or '2.0'))
             container_name = 'adt-{}'.format(body['request_id'])
             swift_client.put_container(container_name)
-            with open(tarball_path) as fd:
+            with open(tarball_path, 'rb') as fd:
                 swift_client.put_object(
                     container_name, obj='results.tgz.tmp', contents=fd,
                     content_type='application/x-compressed')

=== modified file 'requirements.txt'
--- requirements.txt	2015-03-04 19:28:28 +0000
+++ requirements.txt	2015-03-05 01:24:28 +0000
@@ -1,2 +1,4 @@
+python-keystoneclient==1.2.0
 python-swiftclient==2.3.1
-kombu==3.0.24
\ No newline at end of file
+kombu==3.0.24
+