Merge lp:~cprov/adt-cloud-worker/refix-keypair-name into lp:adt-cloud-worker

[Celso Providelo]

Re-fix the keypair option we pass to adt-run (I got it wrong in the previous commit).

Re-fix the keypair option we pass to adt-run (I got it wrong in the previous commit).

[Para Siva (psivaa)]

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-06 12:23:21 +0000
+++ adt_cloud_worker/__init__.py	2015-03-06 16:39:21 +0000
@@ -149,7 +149,7 @@
     adt_ssh_nova_args = [
         '--',
         # Deployment (charm) creates a keypair named after the worker. 
-        '-k', request_configuration['worker_name'],
+        '-k', request_configuration['worker'],
         '--flavor', request_configuration['nova_flavor'],
         '--image', request_configuration['nova_image'],
     ]

=== modified file 'adt_cloud_worker/tests/test_cloud_worker.py'
--- adt_cloud_worker/tests/test_cloud_worker.py	2015-03-06 12:23:21 +0000
+++ adt_cloud_worker/tests/test_cloud_worker.py	2015-03-06 16:39:21 +0000
@@ -42,7 +42,7 @@
         dictionary.
         """
         defaults = {
-            'worker_name': 'worker-foo',
+            'worker': 'worker-foo',
             'package_name': "some_package_name",
             'result_dir': '/tmp/some/dir',
             'nova_flavor': 'some-nova-flavour',