diff options
| author | James Falcon <james.falcon@canonical.com> | 2022-01-15 11:55:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-15 10:55:23 -0700 |
| commit | b306633fd17e5ba0173ad3c41add59cb11884757 (patch) | |
| tree | 51e97864d4ab610ac527b33a13fbca753664690b /cloudinit/sources | |
| parent | 73b1bb1f7665216053494717de27d7daf445d751 (diff) | |
| download | vyos-cloud-init-b306633fd17e5ba0173ad3c41add59cb11884757.tar.gz vyos-cloud-init-b306633fd17e5ba0173ad3c41add59cb11884757.zip | |
Ensure system_cfg read before ds net config on Oracle (SC-720) (#1174)
In 2c52e6e88b19f5db8d55eb7280ee27703e05d75f, the order of
reading network config was changed for Oracle due to initramfs
needing to take lower precedence than the datasource. However,
this also bumped system_cfg to a lower precedence than ds, which
means that any network configuration specified in /etc/cloud will not
be applied. system_cfg should instead be moved above ds so network
configuration in /etc/cloud takes precedence.
LP: #1956788
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceOracle.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOracle.py b/cloudinit/sources/DataSourceOracle.py index 3f918672..6d81be1e 100644 --- a/cloudinit/sources/DataSourceOracle.py +++ b/cloudinit/sources/DataSourceOracle.py @@ -104,9 +104,9 @@ class DataSourceOracle(sources.DataSource): vendordata_pure = None network_config_sources = ( sources.NetworkConfigSource.cmdline, + sources.NetworkConfigSource.system_cfg, sources.NetworkConfigSource.ds, sources.NetworkConfigSource.initramfs, - sources.NetworkConfigSource.system_cfg, ) _network_config = sources.UNSET |