merge from trunk

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1286e7c1..1c240c68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
    apt_get_wrapper (LP: #1236531).
  - convert paths provided in config-drive 'files' to string before writing
    (LP: #1260072).
+ - Azure: minor changes in logging output. ensure filenames are strings (not
+   unicode).
+ - config/cloud.cfg.d/05_logging.cfg: provide a default 'output' setting, to
+   redirect cloud-init stderr and stdout /var/log/cloud-init-output.log.
 0.7.4:
  - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a
    partitioned block device with target filesystem on ephemeral0.1.
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
index b18c57e7..97f151d6 100644
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@ -154,7 +154,7 @@ class DataSourceAzureNet(sources.DataSource):
 
         fp_files = []
         for pk in self.cfg.get('_pubkeys', []):
-            bname = pk['fingerprint'] + ".crt"
+            bname = str(pk['fingerprint'] + ".crt")
             fp_files += [os.path.join(mycfg['data_dir'], bname)]
 
         missing = util.log_time(logfunc=LOG.debug, msg="waiting for files",
@@ -247,7 +247,7 @@ def pubkeys_from_crt_files(flist):
         try:
             pubkeys.append(crtfile_to_pubkey(fname))
         except util.ProcessExecutionError:
-            errors.extend(fname)
+            errors.append(fname)
 
     if errors:
         LOG.warn("failed to convert the crt files to pubkey: %s" % errors)
diff --git a/config/cloud.cfg.d/05_logging.cfg b/config/cloud.cfg.d/05_logging.cfg
index 410a0650..2e180730 100644
--- a/config/cloud.cfg.d/05_logging.cfg
+++ b/config/cloud.cfg.d/05_logging.cfg
@@ -59,3 +59,8 @@ log_cfgs:
  - [ *log_base, *log_file ]
 # A file path can also be used
 # - /etc/log.conf
+
+# this tells cloud-init to redirect its stdout and stderr to
+# 'tee -a /var/log/cloud-init-output.log' so the user can see output
+# there without needing to look on the console.
+output: {all: '| tee -a /var/log/cloud-init-output.log'}