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

Proposed by Celso Providelo
Status: Merged
Approved by: Celso Providelo
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~cprov/adt-cloud-worker/refix-keypair-name
Merge into: lp:adt-cloud-worker
Diff against target: 25 lines (+2/-2)
2 files modified
adt_cloud_worker/__init__.py (+1/-1)
adt_cloud_worker/tests/test_cloud_worker.py (+1/-1)
To merge this branch: bzr merge lp:~cprov/adt-cloud-worker/refix-keypair-name
Reviewer Review Type Date Requested Status
Para Siva (community) Approve
Review via email: mp+252143@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Para Siva (psivaa) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
149 adt_ssh_nova_args = [149 adt_ssh_nova_args = [
150 '--',150 '--',
151 # Deployment (charm) creates a keypair named after the worker. 151 # Deployment (charm) creates a keypair named after the worker.
152 '-k', request_configuration['worker_name'],152 '-k', request_configuration['worker'],
153 '--flavor', request_configuration['nova_flavor'],153 '--flavor', request_configuration['nova_flavor'],
154 '--image', request_configuration['nova_image'],154 '--image', request_configuration['nova_image'],
155 ]155 ]
156156
=== 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 @@
42 dictionary.42 dictionary.
43 """43 """
44 defaults = {44 defaults = {
45 'worker_name': 'worker-foo',45 'worker': 'worker-foo',
46 'package_name': "some_package_name",46 'package_name': "some_package_name",
47 'result_dir': '/tmp/some/dir',47 'result_dir': '/tmp/some/dir',
48 'nova_flavor': 'some-nova-flavour',48 'nova_flavor': 'some-nova-flavour',

Subscribers

People subscribed via source and target branches