Merge lp:~cprov/charms/trusty/adt-cloud-worker/keypair-name into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk

[Celso Providelo]

Nova keypair setup naming changes to accommodate the kill of [adt] configuration section.

Nova keypair setup naming changes to accommodate https://code.launchpad.net/~cprov/adt-cloud-worker/kill-adt-config/+merge/252524.

Worker exclusive keypair is named after the machine security-group name (hostname.replace('-machine', '')) instead of adt.name configuration variable (which is gone).

[lp:~cprov/charms/trusty/adt-cloud-worker/keypair-name]

12. By Celso Providelo on 2015-03-11

Duh, missing renaming.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-10 23:15:24 +0000
+++ hooks/actions.py	2015-03-11 00:38:03 +0000
@@ -65,20 +65,19 @@
             continue
         os.environ[k.upper()] = str(v)
 
-    worker_name = config.get('adt', 'name')
-    hookenv.log('Resetting keypair "%s" ...' % worker_name)
+    worker_secgroup = socket.gethostname().replace('-machine', '')
+    hookenv.log('Resetting keypair "%s" ...' % worker_secgroup)
     try:
-        cmd = 'nova keypair-delete %s' % worker_name
+        cmd = 'nova keypair-delete %s' % worker_secgroup
         subprocess.check_call(cmd, shell=True)
     except subprocess.CalledProcessError:
         # It may not exist.
         pass
-    cmd = 'nova keypair-add --pub-key %s %s' % (pubkey_path, worker_name)
+    cmd = 'nova keypair-add --pub-key %s %s' % (pubkey_path, worker_secgroup)
     subprocess.check_call(cmd, shell=True)
 
     # Ensure there is a "restrictive" security group named after the
     # worker hostname (e.g.: 'juju-bootstack-1-testbed'). 
-    worker_secgroup = socket.gethostname().replace('-machine', '')
     testbed_secgroup = '%s-testbed' % worker_secgroup
 
     try: