diff options
| author | Scott Moser <smoser@brickies.net> | 2017-06-15 10:03:45 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-06-15 17:10:54 -0400 |
| commit | ecb408afa1104fe49ce6eb1dc5708be56abd5cb2 (patch) | |
| tree | 8d1161c2f44f07aec73348fa6d2c8a14701d7dd6 /cloudinit/sources/DataSourceAzure.py | |
| parent | 9ccb8f5e2ab262ee04bb9c103c1302479f7c81d3 (diff) | |
| download | vyos-cloud-init-ecb408afa1104fe49ce6eb1dc5708be56abd5cb2.tar.gz vyos-cloud-init-ecb408afa1104fe49ce6eb1dc5708be56abd5cb2.zip | |
FreeBSD: Make freebsd a variant, fix unittests and tools/build-on-freebsd.
- Simplify the logic of 'variant' in util.system_info
much of the data from
https://github.com/hpcugent/easybuild/wiki/OS_flavor_name_version
- fix get_resource_disk_on_freebsd when running on a system without
an Azure resource disk.
- fix tools/build-on-freebsd to replace oauth with oauthlib and add
bash which is a dependency for tests.
- update a fiew places that were checking for freebsd but not using
the util.is_FreeBSD()
Diffstat (limited to 'cloudinit/sources/DataSourceAzure.py')
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 71e7c55c..4fe0d635 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -101,7 +101,7 @@ def get_dev_storvsc_sysctl(): sysctl_out, err = util.subp(['sysctl', 'dev.storvsc']) except util.ProcessExecutionError: LOG.debug("Fail to execute sysctl dev.storvsc") - return None + sysctl_out = "" return sysctl_out |