summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/sources/DataSourceAzure.py6
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 47c25027..a255d24a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
- support individual MIME segments to be gzip compressed (LP: #1203203)
- always finalize handlers even if processing failed (LP: #1203368)
- support merging into cloud-config via jsonp. (LP: #1200476)
+ - add datasource 'SmartOS' for Joyent Cloud. Adds a dependency on serial.
0.7.2:
- add a debian watch file
- add 'sudo' entry to ubuntu's default user (LP: #1080717)
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
index 9503b045..2f28702e 100644
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@ -206,9 +206,11 @@ def apply_hostname_bounce(hostname, policy, interface, command,
command = BOUNCE_COMMAND
LOG.debug("pubhname: publishing hostname [%s]", msg)
+ start = time.time()
shell = not isinstance(command, (list, tuple))
- (output, err) = util.subp(command, shell=shell, capture=True, env=env)
- LOG.debug("output: %s. err: %s", output, err)
+ # capture=False, see comments in bug 1202758 and bug 1206164.
+ (output, err) = util.subp(command, shell=shell, capture=False, env=env)
+ LOG.debug("publishing hostname took %.3f seconds", time.time() - start)
def crtfile_to_pubkey(fname):