forked from pool/cloud-init
Robert Schweikert
e433cb693e
+ Also include VMWare functionality for (jsc#PM-3175)
+ Remove patches included upstream:
- cloud-init-purge-cache-py-ver-change.patch
- cloud-init-update-test-characters-in-substitution-unit-test.patch
+ Forward port:
- cloud-init-write-routes.patch
- cloud-init-no-tempnet-oci.patch
+ Add cloud-init-vmware-test.patch
- Test is system dependend, not properly mocked
+ Azure: fallback nic needs to be reevaluated during reprovisioning
(#1094) [Anh Vo]
+ azure: pps imds (#1093) [Anh Vo]
+ testing: Remove calls to 'install_new_cloud_init' (#1092)
+ Add LXD datasource (#1040)
+ Fix unhandled apt_configure case. (#1065) [Brett Holman]
+ Allow libexec for hotplug (#1088)
+ Add necessary mocks to test_ovf unit tests (#1087)
+ Remove (deprecated) apt-key (#1068) [Brett Holman] (LP: #1836336)
+ distros: Remove a completed "TODO" comment (#1086)
+ cc_ssh.py: Add configuration for controlling ssh-keygen output (#1083)
[dermotbradley]
+ Add "install hotplug" module (SC-476) (#1069) (LP: #1946003)
+ hosts.alpine.tmpl: rearrange the order of short and long hostnames
(#1084) [dermotbradley]
+ Add max version to docutils
+ cloudinit/dmi.py: Change warning to debug to prevent console display
(#1082) [dermotbradley]
+ remove unnecessary EOF string in
disable-sshd-keygen-if-cloud-init-active.conf (#1075) [Emanuele
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=193
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
--- cloudinit/sources/DataSourceOracle.py.orig
|
|
+++ cloudinit/sources/DataSourceOracle.py
|
|
@@ -134,14 +134,17 @@ class DataSourceOracle(sources.DataSourc
|
|
BUILTIN_DS_CONFIG["configure_secondary_nics"]
|
|
)
|
|
network_context = noop()
|
|
- if not _is_iscsi_root():
|
|
- network_context = dhcp.EphemeralDHCPv4(
|
|
- iface=net.find_fallback_nic(),
|
|
- connectivity_url_data={
|
|
- "url": METADATA_PATTERN.format(version=2, path="instance"),
|
|
- "headers": V2_HEADERS,
|
|
- }
|
|
- )
|
|
+ # 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(
|
|
+ # iface=net.find_fallback_nic(),
|
|
+ # connectivity_url_data={
|
|
+ # "url": METADATA_PATTERN.format(version=2, path="instance"),
|
|
+ # "headers": V2_HEADERS,
|
|
+ # }
|
|
+ # )
|
|
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
|
|
|
|
def enter_context_manager():
|