diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-04-03 17:01:38 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-04-03 17:01:38 -0600 |
| commit | 2901835b6ab89f553ce4c3bb22451fad5f3a4f68 (patch) | |
| tree | 444f44ab4dece9b8daba3feff89204547c22fab8 /cloudinit/util.py | |
| parent | 710dbc8293706ab004326ce9b882bceb6e8cca93 (diff) | |
| parent | 05926e48eae0fa70a26da6449617e04e87c4e704 (diff) | |
| download | vyos-cloud-init-2901835b6ab89f553ce4c3bb22451fad5f3a4f68.tar.gz vyos-cloud-init-2901835b6ab89f553ce4c3bb22451fad5f3a4f68.zip | |
merge from master at 18.2-4-g05926e48
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index 0ab2c484..acdc0d85 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2249,7 +2249,15 @@ def get_mount_info_freebsd(path): def get_device_info_from_zpool(zpool): - (zpoolstatus, err) = subp(['zpool', 'status', zpool]) + # zpool has 10 second timeout waiting for /dev/zfs LP: #1760173 + if not os.path.exists('/dev/zfs'): + LOG.debug('Cannot get zpool info, no /dev/zfs') + return None + try: + (zpoolstatus, err) = subp(['zpool', 'status', zpool]) + except ProcessExecutionError as err: + LOG.warning("Unable to get zpool status of %s: %s", zpool, err) + return None if len(err): return None r = r'.*(ONLINE).*' |