2020-01-17 22:33:13 +01:00
|
|
|
--- cloudinit/sources/DataSourceOracle.py.orig
|
|
|
|
|
+++ cloudinit/sources/DataSourceOracle.py
|
2021-08-19 14:25:42 +02:00
|
|
|
@@ -133,8 +133,11 @@ class DataSourceOracle(sources.DataSourc
|
|
|
|
|
BUILTIN_DS_CONFIG["configure_secondary_nics"]
|
|
|
|
|
)
|
|
|
|
|
network_context = noop()
|
|
|
|
|
- if not _is_iscsi_root():
|
|
|
|
|
- network_context = dhcp.EphemeralDHCPv4(net.find_fallback_nic())
|
|
|
|
|
+ # SUSE images are built with iSCSI setup. The detection of the
|
|
|
|
|
+ # configured network for iscsi boot is distribution dependent.
|
|
|
|
|
+ # There's no implementation for openSUSE/SLE yet.
|
|
|
|
|
+ #if not _is_iscsi_root():
|
|
|
|
|
+ # network_context = dhcp.EphemeralDHCPv4(net.find_fallback_nic())
|
|
|
|
|
with network_context:
|
|
|
|
|
fetched_metadata = read_opc_metadata(
|
|
|
|
|
fetch_vnics_data=fetch_vnics_data
|
|
|
|
|
--- cloudinit/sources/tests/test_oracle.py.orig
|
|
|
|
|
+++ cloudinit/sources/tests/test_oracle.py
|
|
|
|
|
@@ -666,6 +666,7 @@ class TestNonIscsiRoot_GetDataBehaviour:
|
|
|
|
|
def test_read_opc_metadata_called_with_ephemeral_dhcp(
|
|
|
|
|
self, m_find_fallback_nic, m_EphemeralDHCPv4, oracle_ds
|
|
|
|
|
):
|
|
|
|
|
+ return
|
|
|
|
|
in_context_manager = False
|
2020-01-17 22:33:13 +01:00
|
|
|
|
2021-08-19 14:25:42 +02:00
|
|
|
def enter_context_manager():
|
