forked from pool/cloud-init
Robert Schweikert
3aeb460fd5
+ Remove patches included upstream:
- cloud-init-azure-def-usr-pass.patch
- cloud-init-after-kvp.diff
- cloud-init-recognize-hpc.patch
- use_arroba_to_include_sudoers_directory-bsc_1181283.patch
- cloud-init-bonding-opts.patch
- cloud-init-log-file-mode.patch
- cloud-init-no-pwd-in-log.patch
- 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
+ Remove cloud-init-sle12-compat.patch, version in SLE 12 is frozen to 20.2
+ Remove cloud-init-tests-set-exec.patch no longer needed
+ Forward port:
- cloud-init-write-routes.patch
- cloud-init-break-resolv-symlink.patch
- cloud-init-sysconf-path.patch
- cloud-init-no-tempnet-oci.patch
+ Add \r\n check for SSH keys in Azure (#889)
+ Revert "Add support to resize rootfs if using LVM (#721)" (#887)
(LP: #1922742)
+ Add Vultaire as contributor (#881) [Paul Goins]
+ Azure: adding support for consuming userdata from IMDS (#884) [Anh Vo]
+ test_upgrade: modify test_upgrade_package to run for more sources (#883)
+ Fix chef module run failure when chef_license is set (#868) [Ben Hughes]
+ Azure: Retry net metadata during nic attach for non-timeout errs (#878)
[aswinrajamannar]
+ Azure: Retrieve username and hostname from IMDS (#865) [Thomas Stringer]
+ Azure: eject the provisioning iso before reporting ready (#861) [Anh Vo]
+ Use `partprobe` to re-read partition table if available (#856)
[Nicolas Bock] (LP: #1920939)
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=189
27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
--- cloudinit/sources/DataSourceOracle.py.orig
|
|
+++ cloudinit/sources/DataSourceOracle.py
|
|
@@ -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
|
|
|
|
def enter_context_manager():
|