diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-02-24 09:07:53 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-02-24 09:07:53 -0500 |
| commit | 3be2a3aaf66601f1218676050f08010c5465ef7e (patch) | |
| tree | dc7bb2055c7335094e12f73653a5d0d173293e04 /cloudinit | |
| parent | 9ab6bbab42ffb5cadbe0afb36aa6967ed94459c3 (diff) | |
| parent | 14d75254351009087efb5baa5cef808c5ef43e17 (diff) | |
| download | vyos-cloud-init-3be2a3aaf66601f1218676050f08010c5465ef7e.tar.gz vyos-cloud-init-3be2a3aaf66601f1218676050f08010c5465ef7e.zip | |
merge from trunk
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 444070bb..6e030217 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -137,7 +137,7 @@ class DataSourceAzureNet(sources.DataSource): if found != ddir: cached_ovfenv = util.load_file( - os.path.join(ddir, 'ovf-env.xml'), quiet=True) + os.path.join(ddir, 'ovf-env.xml'), quiet=True, decode=False) if cached_ovfenv != files['ovf-env.xml']: # source was not walinux-agent's datadir, so we have to clean # up so 'wait_for_files' doesn't return early due to stale data @@ -593,7 +593,7 @@ def load_azure_ds_dir(source_dir): if not os.path.isfile(ovf_file): raise NonAzureDataSource("No ovf-env file found") - with open(ovf_file, "r") as fp: + with open(ovf_file, "rb") as fp: contents = fp.read() md, ud, cfg = read_azure_ovf(contents) |