diff options
| author | Alberto Contreras <alberto.contreras@canonical.com> | 2023-03-05 04:47:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-04 20:47:41 -0700 |
| commit | 6b9bf7b9bb2db20b7d254f0143df343e14f4c7d4 (patch) | |
| tree | d7d2a46cf59170022ca6c20a052f55c851c7e262 /cloudinit/sources | |
| parent | b728b4e7cda8643c83d5c390411995f759cf97fa (diff) | |
| download | cloud-init-git-6b9bf7b9bb2db20b7d254f0143df343e14f4c7d4.tar.gz | |
oracle-ds: prefer system_cfg over ds network config source (#1998)
Bump system_cfg over ds network_config_source for Oracle DS,
so that if network config is defined under /etc/cloud,
it will be honored.
In a previous change, we moved the initramfs and system_cfg
bellow ds to favor ds, but this implied system-wide configs
were always not honored.
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 7f43b9e2..b88b55e2 100644 --- a/cloudinit/sources/DataSourceOracle.py +++ b/cloudinit/sources/DataSourceOracle.py @@ -118,9 +118,9 @@ class DataSourceOracle(sources.DataSource): vendordata_pure = None network_config_sources: Tuple[sources.NetworkConfigSource, ...] = ( sources.NetworkConfigSource.CMD_LINE, + sources.NetworkConfigSource.SYSTEM_CFG, sources.NetworkConfigSource.DS, sources.NetworkConfigSource.INITRAMFS, - sources.NetworkConfigSource.SYSTEM_CFG, ) _network_config: dict = {"config": [], "version": 1} |