forked from pool/cloud-init
Robert Schweikert
67d6374692
+ Remove patches included upstream: - cloud-init-vmware-test.patch - cloud-init-sysctl-not-in-bin.patch + 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 cloud-init-btrfs-queue-resize.patch (bsc#1171511) + Add cloud-init-micro-is-suse.patch (bsc#1203393) [Martin Petersen] + Add cloud-init-suse-afternm.patch + test: fix pro integration test [Alberto Contreras] + cc_disk_setup: pass options in correct order to utils (#1829) [dermotbradley] + tests: text_lxd basic_preseed verify_clean_log (#1826) + docs: switch sphinx theme to furo (SC-1327) (#1821) [Alberto Contreras] + tests: activate Ubuntu Pro tests (only on Jenkins) (#1777) [Alberto Contreras] + tests: test_lxd assert features.storage.buckets when present (#1827) + tests: replace missed ansible install-method with underscore (#1825) + tests: replace ansible install-method with underscore + ansible: standardize schema keys + ci: run json tool on 22.04 rather than 20.04 (#1823) + Stop using devices endpoint for LXD network config (#1819) + apport: address new curtin log and config locations (#1812) + cc_grub: reword docs for clarity (#1818) + tests: Fix preseed test (#1820) + Auto-format schema (#1810) + Ansible Control Module (#1778) OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=195
22 lines
801 B
Diff
22 lines
801 B
Diff
--- cloudinit/sources/DataSourceOracle.py.orig
|
|
+++ cloudinit/sources/DataSourceOracle.py
|
|
@@ -204,6 +204,8 @@ class DataSourceOracle(sources.DataSourc
|
|
|
|
def _is_iscsi_root(self) -> bool:
|
|
"""Return whether we are on a iscsi machine."""
|
|
+ # SUSE images are built with iSCSI setup.
|
|
+ return True
|
|
return self._network_config_source.is_applicable()
|
|
|
|
def _get_iscsi_config(self) -> dict:
|
|
--- tests/unittests/sources/test_oracle.py.orig
|
|
+++ tests/unittests/sources/test_oracle.py
|
|
@@ -996,6 +996,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():
|