Moved the handlers from a user_data directory to a handler directory.

35 files changed, 3 insertions, 3 deletions

diff --git a/cloudinit/user_data/boot_hook.py b/cloudinit/handlers/boot_hook.py
index 87e7a3ec..c75aeb72 100644
--- a/cloudinit/user_data/boot_hook.py
+++ b/cloudinit/handlers/boot_hook.py
@@ -60,7 +60,7 @@ class BootHookPartHandler(ud.PartHandler):
             env['INSTANCE_ID'] = str(self.instance_id)
             util.subp([filepath], env=env)
         except util.ProcessExecutionError as e:
-            LOG.error("Boothooks script %s execution error %s", filepath, e)
+            util.logexc(LOG, "Boothooks script %s execution error", filepath)
         except Exception as e:
-            LOG.exception(("Boothooks unknown "
-                           "error %s when running %s"), e, filepath)
+            util.logexc(LOG, ("Boothooks unknown "
+                              "error when running %s"), filepath)
diff --git a/cloudinit/handlers/__init__.py b/cloudinit/transforms/__init__.py
index 5d70ac43..5d70ac43 100644
--- a/cloudinit/handlers/__init__.py
+++ b/cloudinit/transforms/__init__.py
diff --git a/cloudinit/handlers/cc_apt_pipelining.py b/cloudinit/transforms/cc_apt_pipelining.py
index 0286a9ae..0286a9ae 100644
--- a/cloudinit/handlers/cc_apt_pipelining.py
+++ b/cloudinit/transforms/cc_apt_pipelining.py
diff --git a/cloudinit/handlers/cc_apt_update_upgrade.py b/cloudinit/transforms/cc_apt_update_upgrade.py
index a7049bce..a7049bce 100644
--- a/cloudinit/handlers/cc_apt_update_upgrade.py
+++ b/cloudinit/transforms/cc_apt_update_upgrade.py
diff --git a/cloudinit/handlers/cc_bootcmd.py b/cloudinit/transforms/cc_bootcmd.py
index f584da02..f584da02 100644
--- a/cloudinit/handlers/cc_bootcmd.py
+++ b/cloudinit/transforms/cc_bootcmd.py
diff --git a/cloudinit/handlers/cc_byobu.py b/cloudinit/transforms/cc_byobu.py
index e821b261..e821b261 100644
--- a/cloudinit/handlers/cc_byobu.py
+++ b/cloudinit/transforms/cc_byobu.py
diff --git a/cloudinit/handlers/cc_ca_certs.py b/cloudinit/transforms/cc_ca_certs.py
index 3af6238a..3af6238a 100644
--- a/cloudinit/handlers/cc_ca_certs.py
+++ b/cloudinit/transforms/cc_ca_certs.py
diff --git a/cloudinit/handlers/cc_chef.py b/cloudinit/transforms/cc_chef.py
index 941e04fe..941e04fe 100644
--- a/cloudinit/handlers/cc_chef.py
+++ b/cloudinit/transforms/cc_chef.py
diff --git a/cloudinit/handlers/cc_disable_ec2_metadata.py b/cloudinit/transforms/cc_disable_ec2_metadata.py
index 6b31ea8e..6b31ea8e 100644
--- a/cloudinit/handlers/cc_disable_ec2_metadata.py
+++ b/cloudinit/transforms/cc_disable_ec2_metadata.py
diff --git a/cloudinit/handlers/cc_final_message.py b/cloudinit/transforms/cc_final_message.py
index abb4ca32..abb4ca32 100644
--- a/cloudinit/handlers/cc_final_message.py
+++ b/cloudinit/transforms/cc_final_message.py
diff --git a/cloudinit/handlers/cc_foo.py b/cloudinit/transforms/cc_foo.py
index 35ec3fa7..35ec3fa7 100644
--- a/cloudinit/handlers/cc_foo.py
+++ b/cloudinit/transforms/cc_foo.py
diff --git a/cloudinit/handlers/cc_grub_dpkg.py b/cloudinit/transforms/cc_grub_dpkg.py
index 9f3a7eaf..9f3a7eaf 100644
--- a/cloudinit/handlers/cc_grub_dpkg.py
+++ b/cloudinit/transforms/cc_grub_dpkg.py
diff --git a/cloudinit/handlers/cc_keys_to_console.py b/cloudinit/transforms/cc_keys_to_console.py
index 73a477c0..73a477c0 100644
--- a/cloudinit/handlers/cc_keys_to_console.py
+++ b/cloudinit/transforms/cc_keys_to_console.py
diff --git a/cloudinit/handlers/cc_landscape.py b/cloudinit/transforms/cc_landscape.py
index a4113cbe..a4113cbe 100644
--- a/cloudinit/handlers/cc_landscape.py
+++ b/cloudinit/transforms/cc_landscape.py
diff --git a/cloudinit/handlers/cc_locale.py b/cloudinit/transforms/cc_locale.py
index 2bb22fdb..2bb22fdb 100644
--- a/cloudinit/handlers/cc_locale.py
+++ b/cloudinit/transforms/cc_locale.py
diff --git a/cloudinit/handlers/cc_mcollective.py b/cloudinit/transforms/cc_mcollective.py
index a2a6230c..a2a6230c 100644
--- a/cloudinit/handlers/cc_mcollective.py
+++ b/cloudinit/transforms/cc_mcollective.py
diff --git a/cloudinit/handlers/cc_mounts.py b/cloudinit/transforms/cc_mounts.py
index 6cdd74e8..6cdd74e8 100644
--- a/cloudinit/handlers/cc_mounts.py
+++ b/cloudinit/transforms/cc_mounts.py
diff --git a/cloudinit/handlers/cc_phone_home.py b/cloudinit/transforms/cc_phone_home.py
index a7ff74e1..a7ff74e1 100644
--- a/cloudinit/handlers/cc_phone_home.py
+++ b/cloudinit/transforms/cc_phone_home.py
diff --git a/cloudinit/handlers/cc_puppet.py b/cloudinit/transforms/cc_puppet.py
index 6fc475f6..6fc475f6 100644
--- a/cloudinit/handlers/cc_puppet.py
+++ b/cloudinit/transforms/cc_puppet.py
diff --git a/cloudinit/handlers/cc_resizefs.py b/cloudinit/transforms/cc_resizefs.py
index 2dc66def..2dc66def 100644
--- a/cloudinit/handlers/cc_resizefs.py
+++ b/cloudinit/transforms/cc_resizefs.py
diff --git a/cloudinit/handlers/cc_rightscale_userdata.py b/cloudinit/transforms/cc_rightscale_userdata.py
index 5ed0848f..5ed0848f 100644
--- a/cloudinit/handlers/cc_rightscale_userdata.py
+++ b/cloudinit/transforms/cc_rightscale_userdata.py
diff --git a/cloudinit/handlers/cc_rsyslog.py b/cloudinit/transforms/cc_rsyslog.py
index ac7f2c74..ac7f2c74 100644
--- a/cloudinit/handlers/cc_rsyslog.py
+++ b/cloudinit/transforms/cc_rsyslog.py
diff --git a/cloudinit/handlers/cc_runcmd.py b/cloudinit/transforms/cc_runcmd.py
index f7e8c671..f7e8c671 100644
--- a/cloudinit/handlers/cc_runcmd.py
+++ b/cloudinit/transforms/cc_runcmd.py
diff --git a/cloudinit/handlers/cc_salt_minion.py b/cloudinit/transforms/cc_salt_minion.py
index 1a3b5039..1a3b5039 100644
--- a/cloudinit/handlers/cc_salt_minion.py
+++ b/cloudinit/transforms/cc_salt_minion.py
diff --git a/cloudinit/handlers/cc_scripts_per_boot.py b/cloudinit/transforms/cc_scripts_per_boot.py
index 41a74754..41a74754 100644
--- a/cloudinit/handlers/cc_scripts_per_boot.py
+++ b/cloudinit/transforms/cc_scripts_per_boot.py
diff --git a/cloudinit/handlers/cc_scripts_per_instance.py b/cloudinit/transforms/cc_scripts_per_instance.py
index a2981eab..a2981eab 100644
--- a/cloudinit/handlers/cc_scripts_per_instance.py
+++ b/cloudinit/transforms/cc_scripts_per_instance.py
diff --git a/cloudinit/handlers/cc_scripts_per_once.py b/cloudinit/transforms/cc_scripts_per_once.py
index a69151da..a69151da 100644
--- a/cloudinit/handlers/cc_scripts_per_once.py
+++ b/cloudinit/transforms/cc_scripts_per_once.py
diff --git a/cloudinit/handlers/cc_scripts_user.py b/cloudinit/transforms/cc_scripts_user.py
index 933aa4e0..933aa4e0 100644
--- a/cloudinit/handlers/cc_scripts_user.py
+++ b/cloudinit/transforms/cc_scripts_user.py
diff --git a/cloudinit/handlers/cc_set_hostname.py b/cloudinit/transforms/cc_set_hostname.py
index acea74d9..acea74d9 100644
--- a/cloudinit/handlers/cc_set_hostname.py
+++ b/cloudinit/transforms/cc_set_hostname.py
diff --git a/cloudinit/handlers/cc_set_passwords.py b/cloudinit/transforms/cc_set_passwords.py
index 9d0bbdb8..9d0bbdb8 100644
--- a/cloudinit/handlers/cc_set_passwords.py
+++ b/cloudinit/transforms/cc_set_passwords.py
diff --git a/cloudinit/handlers/cc_ssh.py b/cloudinit/transforms/cc_ssh.py
index 48eb58bc..48eb58bc 100644
--- a/cloudinit/handlers/cc_ssh.py
+++ b/cloudinit/transforms/cc_ssh.py
diff --git a/cloudinit/handlers/cc_ssh_import_id.py b/cloudinit/transforms/cc_ssh_import_id.py
index bbf5bd83..bbf5bd83 100644
--- a/cloudinit/handlers/cc_ssh_import_id.py
+++ b/cloudinit/transforms/cc_ssh_import_id.py
diff --git a/cloudinit/handlers/cc_timezone.py b/cloudinit/transforms/cc_timezone.py
index e5c9901b..e5c9901b 100644
--- a/cloudinit/handlers/cc_timezone.py
+++ b/cloudinit/transforms/cc_timezone.py
diff --git a/cloudinit/handlers/cc_update_etc_hosts.py b/cloudinit/transforms/cc_update_etc_hosts.py
index 6ad2fca8..6ad2fca8 100644
--- a/cloudinit/handlers/cc_update_etc_hosts.py
+++ b/cloudinit/transforms/cc_update_etc_hosts.py
diff --git a/cloudinit/handlers/cc_update_hostname.py b/cloudinit/transforms/cc_update_hostname.py
index b9d1919a..b9d1919a 100644
--- a/cloudinit/handlers/cc_update_hostname.py
+++ b/cloudinit/transforms/cc_update_hostname.py