Merge with upstream sources

4 files changed, 111 insertions, 4 deletions

diff --git a/cloudinit/config/cc_debug.py b/cloudinit/config/cc_debug.py
new file mode 100644
index 00000000..cfd31fa1
--- /dev/null
+++ b/cloudinit/config/cc_debug.py
@@ -0,0 +1,79 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2013 Yahoo! Inc.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from StringIO import StringIO
+from cloudinit import util
+from cloudinit import type_utils
+import copy
+
+
+def _make_header(text):
+    header = StringIO()
+    header.write("-" * 80)
+    header.write("\n")
+    header.write(text.center(80, ' '))
+    header.write("\n")
+    header.write("-" * 80)
+    header.write("\n")
+    return header.getvalue()
+
+
+def handle(name, cfg, cloud, log, args):
+    verbose = util.get_cfg_by_path(cfg, ('debug', 'verbose'), default=True)
+    if args:
+        # if args are provided (from cmdline) then explicitly set verbose
+        out_file = args[0]
+        verbose = True
+    else:
+        out_file = util.get_cfg_by_path(cfg, ('debug', 'output'))
+
+    if not verbose:
+        log.debug(("Skipping module named %s,"
+                   " verbose printing disabled"), name)
+        return
+    # Clean out some keys that we just don't care about showing...
+    dump_cfg = copy.deepcopy(cfg)
+    for k in ['log_cfgs']:
+        dump_cfg.pop(k, None)
+    all_keys = list(dump_cfg.keys())
+    for k in all_keys:
+        if k.startswith("_"):
+            dump_cfg.pop(k, None)
+    # Now dump it...
+    to_print = StringIO()
+    to_print.write(_make_header("Config"))
+    to_print.write(util.yaml_dumps(dump_cfg))
+    to_print.write("\n")
+    to_print.write(_make_header("MetaData"))
+    to_print.write(util.yaml_dumps(cloud.datasource.metadata))
+    to_print.write("\n")
+    to_print.write(_make_header("Misc"))
+    to_print.write("Datasource: %s\n" %
+                   (type_utils.obj_name(cloud.datasource)))
+    to_print.write("Distro: %s\n" % (type_utils.obj_name(cloud.distro)))
+    to_print.write("Hostname: %s\n" % (cloud.get_hostname(True)))
+    to_print.write("Instance ID: %s\n" % (cloud.get_instance_id()))
+    to_print.write("Locale: %s\n" % (cloud.get_locale()))
+    to_print.write("Launch IDX: %s\n" % (cloud.launch_index))
+    contents = to_print.getvalue()
+    content_to_file = []
+    for line in contents.splitlines():
+        line = "ci-info: %s\n" % (line)
+        content_to_file.append(line)
+    if out_file:
+        util.write_file(out_file, "".join(content_to_file), 0644, "w")
+    else:
+        util.multi_log("".join(content_to_file), console=True, stderr=False)
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index 8fe49cbe..1ae232fd 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -36,6 +36,10 @@ LOG = logging.getLogger(__name__)
 APT_GET_COMMAND = ('apt-get', '--option=Dpkg::Options::=--force-confold',
                    '--option=Dpkg::options::=--force-unsafe-io',
                    '--assume-yes', '--quiet')
+APT_GET_WRAPPER = {
+    'command': 'eatmydata',
+    'enabled': 'auto',
+}
 
 
 class Distro(distros.Distro):
@@ -148,7 +152,13 @@ class Distro(distros.Distro):
         # See: http://tiny.cc/kg91fw
         # Or: http://tiny.cc/mh91fw
         e['DEBIAN_FRONTEND'] = 'noninteractive'
-        cmd = list(self.get_option("apt_get_command", APT_GET_COMMAND))
+
+        wcfg = self.get_option("apt_get_wrapper", APT_GET_WRAPPER)
+        cmd = _get_wrapper_prefix(
+            wcfg.get('command', APT_GET_WRAPPER['command']),
+            wcfg.get('enabled', APT_GET_WRAPPER['enabled']))
+
+        cmd.extend(list(self.get_option("apt_get_command", APT_GET_COMMAND)))
 
         if args and isinstance(args, str):
             cmd.append(args)
@@ -166,7 +176,9 @@ class Distro(distros.Distro):
         cmd.extend(pkglist)
 
         # Allow the output of this to flow outwards (ie not be captured)
-        util.subp(cmd, env=e, capture=False)
+        util.log_time(logfunc=LOG.debug,
+            msg="apt-%s [%s]" % (command, ' '.join(cmd)), func=util.subp,
+            args=(cmd,), kwargs={'env': e, 'capture': False})
 
     def update_package_sources(self):
         self._runner.run("update-sources", self.package_command,
@@ -175,3 +187,15 @@ class Distro(distros.Distro):
     def get_primary_arch(self):
         (arch, _err) = util.subp(['dpkg', '--print-architecture'])
         return str(arch).strip()
+
+
+def _get_wrapper_prefix(cmd, mode):
+    if isinstance(cmd, str):
+        cmd = [str(cmd)]
+
+    if (util.is_true(mode) or
+        (str(mode).lower() == "auto" and cmd[0] and
+         util.which(cmd[0]))):
+        return cmd
+    else:
+        return []
diff --git a/cloudinit/importer.py b/cloudinit/importer.py
index 71cf2726..a094141a 100644
--- a/cloudinit/importer.py
+++ b/cloudinit/importer.py
@@ -36,6 +36,7 @@ def find_module(base_name, search_paths, required_attrs=None):
     found_places = []
     if not required_attrs:
         required_attrs = []
+    # NOTE(harlowja): translate the search paths to include the base name.
     real_paths = []
     for path in search_paths:
         real_path = []
@@ -50,8 +51,9 @@ def find_module(base_name, search_paths, required_attrs=None):
         mod = None
         try:
             mod = import_module(full_path)
-        except ImportError:
-            pass
+        except ImportError as e:
+            LOG.debug("Failed at attempted import of '%s' due to: %s",
+                      full_path, e)
         if not mod:
             continue
         found_attrs = 0
diff --git a/cloudinit/util.py b/cloudinit/util.py
index b69e2bb0..6b30af5e 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -170,6 +170,8 @@ class SeLinuxGuard(object):
     def __exit__(self, excp_type, excp_value, excp_traceback):
         if self.selinux and self.selinux.is_selinux_enabled():
             path = os.path.realpath(os.path.expanduser(self.path))
+            # path should be a string, not unicode
+            path = str(path)
             do_restore = False
             try:
                 # See if even worth restoring??