Merge lp:~cprov/adt-cloud-worker/uci-nova into lp:adt-cloud-worker

[Celso Providelo]

Adjust `adt-run` call to use our 'uci-nova' ssh-setup.

Adjust `adt-run` call to use our 'uci-nova' ssh-setup.

Took the opportunity to enable debug in all channels, so we have more information about failures during development. It doesn't necessarily have to be released.

[Joe Talbott (joetalbott)]

LGTM

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-11 00:18:45 +0000
+++ adt_cloud_worker/__init__.py	2015-03-12 16:09:05 +0000
@@ -161,6 +161,7 @@
     :returns: A tuple of arguments.
     """
     adt_run_args = [
+        '-d',
         '--apt-source', request_configuration['package_name'],
         '--output-dir', request_configuration['result_dir'],
     ]
@@ -171,10 +172,7 @@
         ]
     adt_ssh_nova_args = [
         '--',
-        # Deployment (charm) creates a keypair named after the worker and
-        # a restricted security-group named as '<worker_name>-testbed'.
-        '-k', request_configuration['worker'],
-        '-s', '{}-testbed'.format(request_configuration['worker']),
+        '-d',
         '--flavor', request_configuration['nova_flavor'],
         '--image', request_configuration['nova_image'],
     ]
@@ -183,7 +181,7 @@
 
     return (
         adt_run_args +
-        ['---', 'ssh', '-s', 'nova'] +
+        ['---', 'ssh', '-s', 'uci-nova', '-d'] +
         adt_ssh_nova_args
     )
 

=== modified file 'adt_cloud_worker/tests/test_cloud_worker.py'
--- adt_cloud_worker/tests/test_cloud_worker.py	2015-03-11 00:18:45 +0000
+++ adt_cloud_worker/tests/test_cloud_worker.py	2015-03-12 16:09:05 +0000
@@ -60,14 +60,15 @@
         )
         self.assertEqual(
             [
+                '-d',
                 '--apt-source', 'some_package_name',
                 '--output-dir', '/tmp/some/dir',
                 '---',
                 'ssh',
-                '-s', 'nova',
+                '-s', 'uci-nova',
+                '-d',
                 '--',
-                '-k', 'worker-foo',
-                '-s', 'worker-foo-testbed',
+                '-d',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
             ],
@@ -79,15 +80,16 @@
         )
         self.assertEqual(
             [
+                '-d',
                 '--apt-source', 'some_package_name',
                 '--output-dir', '/tmp/some/dir',
                 '--apt-pocket', 'foo', '--apt-upgrade',
                 '---',
                 'ssh',
-                '-s', 'nova',
+                '-s', 'uci-nova',
+                '-d',
                 '--',
-                '-k', 'worker-foo',
-                '-s', 'worker-foo-testbed',
+                '-d',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
             ],