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

[Celso Providelo]

Install 'uci-nova' ssh-setup on the default autopkgtest location so it can be used by workers.

Install 'uci-nova' ssh-setup on the default autopkgtest location so it can be used by workers.

[Ubuntu CI Bot (uci-bot)]

Voting does not meet specified criteria. Required: Approve >= 1. Got: 1 Pending.

[Paul Larson (pwlars)]

Looks great to me, this simplifies things.

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-03-11 00:38:18 +0000
+++ hooks/actions.py	2015-03-12 16:00:51 +0000
@@ -1,7 +1,6 @@
 import base64
-import ConfigParser as configparser
 import os
-import socket
+import shutil
 import subprocess
 
 from charmhelpers import fetch
@@ -44,88 +43,11 @@
         f.write(config_content)
 
 
-def reset_nova(service_name):
-    hookenv.log('Attempting to reset nova key-pairs ...')
-    pubkey_path = os.path.expanduser('~/.ssh/id_rsa.pub')
-    if os.path.exists(pubkey_path):
-        hookenv.log('SSH key already exists, nothing to do ...')
-        return
-
-    hookenv.log('Generating a new SSH key ...')
-    seckey_path = pubkey_path[:-4]
-    cmd = 'ssh-keygen -f %s -q -N ""' % seckey_path
-    subprocess.check_call(cmd, shell=True)
-
-    config_path = os.path.join(SERVICE_DIR, '.adt-service.conf')
-    hookenv.log('Using current app configuration from: %s' % config_path)
-    config = configparser.ConfigParser()
-    config.read(config_path)
-    for k, v in config.items('nova'):
-        if not k.startswith('os_'):
-            continue
-        os.environ[k.upper()] = str(v)
-
-    worker_secgroup = socket.gethostname().replace('-machine', '')
-    hookenv.log('Resetting keypair "%s" ...' % worker_secgroup)
-    try:
-        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_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'). 
-    testbed_secgroup = '%s-testbed' % worker_secgroup
-
-    try:
-        subprocess.check_call(
-            ['neutron', 'security-group-delete', testbed_secgroup])
-    except subprocess.CalledProcessError:
-        # It may not exist.
-        pass
-
-    subprocess.check_call(
-        ['neutron', 'security-group-create', testbed_secgroup,
-         '--description', '"%s worker testbeds"' % (worker_secgroup)])
-
-    # Drop default rules allowing all egress traffic IPv[4,6].
-    permissive_rule_ids = subprocess.check_output(
-        'neutron security-group-rule-list --format csv '
-        '-c id -c security_group --quote none '
-        '| grep %s | cut -d\',\' -f1' % testbed_secgroup,
-        shell=True).splitlines()
-    for rule_id in permissive_rule_ids:
-        subprocess.check_call(
-            ['neutron', 'security-group-rule-delete', rule_id])
-
-    allow_rules = (
-        # SSH (tcp:22) ingress connections from the worker (adt).
-        {'direction': 'ingress', 'protocol': 'tcp',
-         'port-range-min': '22', 'port-range-max': '22',
-         'remote-group-id': worker_secgroup},
-
-        # APT (nova.clouds.archive.ubuntu.com, security.ubuntu.com) &
-        # NTP (ntp.ubuntu.com).
-        {'direction': 'egress', 'remote-ip-prefix': '91.189.88.0/21'},
-
-        # Cloud DNS.
-        {'direction': 'egress', 'remote-ip-prefix': '8.8.8.8'},
-
-        # XXX cprov 2015-03-10: Check with mpitti if the network restriction
-        # is valid or we are raising the bar too high for tests.
-        # Blanket rule allowing all ipv4 egress traffic, because the above
-        # are not enough to boot.
-        {'direction': 'egress', 'ethertype': 'ipv4'},
-    )
-
-    for rule in allow_rules:
-        cmd_args = ['neutron', 'security-group-rule-create']
-        [cmd_args.extend(['--%s' % (k), v]) for k,v in rule.iteritems()]
-        cmd_args.append(testbed_secgroup)
-        subprocess.check_call(cmd_args)
+def install_adt_uci_nova(service_name):
+    hookenv.log('Attempting to install "uci-nova" autopkgtest ssh-setup ...')
+    shutil.copy2(
+        os.path.join(hookenv.charm_dir(), 'files', 'uci-nova'),
+        '/usr/share/autopkgtest/ssh-setup/')
 
 
 def install_python_packages(service_name):
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-10 19:30:51 +0000
+++ hooks/services.py	2015-03-12 16:00:51 +0000
@@ -18,7 +18,7 @@
                 actions.get_cloud_worker_from_tarball,
                 actions.install_python_packages,
                 actions.get_config_file,
-                actions.reset_nova,
+                actions.install_adt_uci_nova,
                 helpers.render_template(
                     source='upstart.conf',
                     target='/etc/init/adt-cloud-worker.conf'),