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

[Francis Ginther]

Remove special handeling of uci-nova.

Remove special handeling of uci-nova.

Requires changes to lp:adt-cloud-worker first.

[Paul Larson (pwlars)]

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-04-22 02:54:30 +0000
+++ hooks/actions.py	2015-04-27 19:09:00 +0000
@@ -57,13 +57,6 @@
     adduser('acw-worker')
 
 
-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):
     env_dir = os.path.join(_service_dir(), 've')
     if os.path.exists(env_dir):
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-03-17 03:17:48 +0000
+++ hooks/services.py	2015-04-27 19:09:00 +0000
@@ -20,7 +20,6 @@
                 actions.install_python_packages,
                 actions.get_config_file,
                 actions.create_user,
-                actions.install_adt_uci_nova,
                 helpers.render_template(
                     source='upstart.conf',
                     target='/etc/init/adt-cloud-worker.conf'),