diff options
| author | Chris Patterson <cpatterson@microsoft.com> | 2022-01-18 15:45:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 14:45:59 -0600 |
| commit | 0988fb89be06aeb08083ce609f755509d08fa459 (patch) | |
| tree | e69ee8811b91d48ba689d0826f00ff99f3ed90ed /cloudinit | |
| parent | f70a1e44e7a6d625dd0aaf7341331142415b3222 (diff) | |
| download | vyos-cloud-init-0988fb89be06aeb08083ce609f755509d08fa459.tar.gz vyos-cloud-init-0988fb89be06aeb08083ce609f755509d08fa459.zip | |
sources/azure: set ovf_is_accessible when OVF is read successfully (#1193)
The if-statement set ovf_is_accessible to True if the OVF is read
from /dev/sr0, but not from other data sources. It defaults to
True, but may get flipped to False while processing an invalid
source, and never get set back to True when reading from the data
directory.
Instead, default ovf_is_accessible to False, and only set it to
True once we've read an OVF successfully (and end the search).
This fixes an error when OVF is read from data_dir and IMDS
data is unavailable (failing with "No OVF or IMDS available").
Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
Diffstat (limited to 'cloudinit')
| -rwxr-xr-x | cloudinit/sources/DataSourceAzure.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 22435284..7134c95a 100755 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -335,7 +335,7 @@ class DataSourceAzure(sources.DataSource): # the candidate list determines the path to take in order to get the # metadata we need. reprovision = False - ovf_is_accessible = True + ovf_is_accessible = False reprovision_after_nic_attach = False metadata_source = None ret = None @@ -368,9 +368,9 @@ class DataSourceAzure(sources.DataSource): ret = util.mount_cb(src, load_azure_ds_dir) # save the device for ejection later self.iso_dev = src - ovf_is_accessible = True else: ret = load_azure_ds_dir(src) + ovf_is_accessible = True metadata_source = src break except NonAzureDataSource: @@ -383,7 +383,6 @@ class DataSourceAzure(sources.DataSource): report_diagnostic_event( "%s was not mountable" % src, logger_func=LOG.debug ) - ovf_is_accessible = False empty_md = {"local-hostname": ""} empty_cfg = dict( system_info=dict(default_user=dict(name="")) |