Merge lp:~fginther/charms/trusty/core-image-tester/remove-uci-nova into lp:~canonical-ci-engineering/charms/trusty/core-image-tester/trunk

[Francis Ginther]

Remove installation of separate uci-nova ssh setup script.

Remove installation of separate uci-nova ssh setup script.

lp:core-image-tester is already using an inline copy of uci-nova.

[Paul Larson (pwlars)]

Yep. On a slightly unrelated note, are we going to remove uci-nova as a separate project to avoid confusion?

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-04-09 18:42:14 +0000
+++ hooks/actions.py	2015-04-28 02:11:54 +0000
@@ -47,15 +47,6 @@
         archive.extract_tarfile(tarball, os.path.dirname(_service_dir()))
 
 
-def install_adt_uci_nova(service_name):
-    hookenv.log('Attempting to install "uci-nova" autopkgtest ssh-setup ...')
-    uci_nova_path = os.path.join(hookenv.charm_dir(), 'files', 'uci-nova')
-    if not os.path.exists(uci_nova_path):
-        hookenv.log('"uci-nova" not provided, nothing installed!')
-        return
-    shutil.copy2(uci_nova_path, '/usr/share/autopkgtest/ssh-setup/')
-
-
 def update_config_file(service_name):
     hookenv.log(
         'Updating service configuration file: %s', SERVICE_CONFIGNAME)

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-04-01 13:44:08 +0000
+++ hooks/services.py	2015-04-28 02:11:54 +0000
@@ -18,7 +18,6 @@
                 actions.install_packages,
                 actions.install_service_tarball,
                 actions.install_python_packages,
-                actions.install_adt_uci_nova,
                 actions.update_config_file,
                 actions.create_user,
                 helpers.render_template(