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

[Celso Providelo]

Creating testbeds accessible by the specific worker keypair (setup by charm).

Creating testbeds accessible by the specific worker keypair (setup by charm).

See https://code.launchpad.net/~cprov/charms/trusty/adt-cloud-worker/nova-keypair-reset/+merge/252095

[Para Siva (psivaa)]

+1

review: Approve

=== modified file 'adt_cloud_worker/__init__.py'
--- adt_cloud_worker/__init__.py	2015-03-05 03:16:25 +0000
+++ adt_cloud_worker/__init__.py	2015-03-06 12:24:56 +0000
@@ -148,6 +148,8 @@
     ]
     adt_ssh_nova_args = [
         '--',
+        # Deployment (charm) creates a keypair named after the worker. 
+        '-k', request_configuration['worker_name'],
         '--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-04 21:43:08 +0000
+++ adt_cloud_worker/tests/test_cloud_worker.py	2015-03-06 12:24:56 +0000
@@ -42,6 +42,7 @@
         dictionary.
         """
         defaults = {
+            'worker_name': 'worker-foo',
             'package_name': "some_package_name",
             'result_dir': '/tmp/some/dir',
             'nova_flavor': 'some-nova-flavour',
@@ -62,6 +63,7 @@
                 'ssh',
                 '-s', 'nova',
                 '--',
+                '-k', 'worker-foo',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
             ],
@@ -80,6 +82,7 @@
                 'ssh',
                 '-s', 'nova',
                 '--',
+                '-k', 'worker-foo',
                 '--flavor', 'some-nova-flavour',
                 '--image', 'some-nova-image',
             ],