summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <daniel.watkins@canonical.com>2015-10-20 10:36:04 +0100
committerDaniel Watkins <daniel.watkins@canonical.com>2015-10-20 10:36:04 +0100
commit5d9a56f7585b1a80a7210710fc989d385c97c3ee (patch)
treeaff5b4a3a58b850731ec080807a76af76122471d
parent4968547752a9f06d49d18f0797ed01c968675252 (diff)
parentc67d5c7e5e6c96f6cd4c2587110f592089f327bd (diff)
downloadvyos-cloud-init-5d9a56f7585b1a80a7210710fc989d385c97c3ee.tar.gz
vyos-cloud-init-5d9a56f7585b1a80a7210710fc989d385c97c3ee.zip
AltCloud: Remove --quiet option from udevadm call
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/sources/DataSourceAltCloud.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 538ffda8..5fbfaccc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@
- power_state_change: support 'condition' to disable or enable poweroff
- ubuntu fan: support for config and installing of ubuntu fan (LP: #1504604)
- Azure: support extracting SSH key values from ovf-env.xml (LP: #1506244)
+ - AltCloud: fix call to udevadm settle (LP: #1507526)
0.7.6:
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py
index fb528ae5..60d58d6d 100644
--- a/cloudinit/sources/DataSourceAltCloud.py
+++ b/cloudinit/sources/DataSourceAltCloud.py
@@ -41,7 +41,7 @@ CLOUD_INFO_FILE = '/etc/sysconfig/cloud-info'
# Shell command lists
CMD_PROBE_FLOPPY = ['/sbin/modprobe', 'floppy']
-CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--quiet', '--timeout=5']
+CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--timeout=5']
META_DATA_NOT_SUPPORTED = {
'block-device-mapping': {},