From 5a5220c86897c8239471d5b7d7e9020c6883e68094538455940252e834f60e93 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 17 Jan 2020 21:33:13 +0000 Subject: [PATCH] - Add cloud-init-no-tempnet-oci.patch (bsc#1161132, bsc#1161133) + Do not attempt to configure an ephemeral network on OCI. We boot off iSCSI and the network is up. Just read the data. OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=160 --- cloud-init-no-tempnet-oci.patch | 25 +++++++++++++++++++++++++ cloud-init.changes | 7 +++++++ cloud-init.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 cloud-init-no-tempnet-oci.patch diff --git a/cloud-init-no-tempnet-oci.patch b/cloud-init-no-tempnet-oci.patch new file mode 100644 index 0000000..583de0b --- /dev/null +++ b/cloud-init-no-tempnet-oci.patch @@ -0,0 +1,25 @@ +--- cloudinit/sources/DataSourceOracle.py.orig ++++ cloudinit/sources/DataSourceOracle.py +@@ -189,11 +189,17 @@ class DataSourceOracle(sources.DataSourc + + # network may be configured if iscsi root. If that is the case + # then read_initramfs_config will return non-None. +- if _is_iscsi_root(): +- data = self.crawl_metadata() +- else: +- with dhcp.EphemeralDHCPv4(net.find_fallback_nic()): +- data = self.crawl_metadata() ++ #if _is_iscsi_root(): ++ # data = self.crawl_metadata() ++ #else: ++ # with dhcp.EphemeralDHCPv4(net.find_fallback_nic()): ++ # data = self.crawl_metadata() ++ # ++ # The detection of the configured network for iscsi boot is ++ # distribution dependent and of course only implemented for ++ # Debian/Ubuntu. We know the network is up as we are booting from ++ # iscsi. Skip the BS and just read the damn data ++ data = self.crawl_metadata() + + self._crawled_metadata = data + vdata = data['2013-10-17'] diff --git a/cloud-init.changes b/cloud-init.changes index 66d3b48..30d104a 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 17 18:55:41 UTC 2020 - Robert Schweikert + +- Add cloud-init-no-tempnet-oci.patch (bsc#1161132, bsc#1161133) + + Do not attempt to configure an ephemeral network on OCI. We + boot off iSCSI and the network is up. Just read the data. + ------------------------------------------------------------------- Tue Jan 14 15:14:52 UTC 2020 - Tomáš Chvátal diff --git a/cloud-init.spec b/cloud-init.spec index 131b46b..e1400b6 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -43,6 +43,8 @@ Patch52: cloud-init-break-resolv-symlink.patch Patch55: cloud-init-mix-static-dhcp.patch # FIXME no proposed solution Patch56: cloud-init-sysconf-path.patch +# FIXME (lp#1860164) +Patch57: cloud-init-no-tempnet-oci.patch BuildRequires: fdupes BuildRequires: filesystem @@ -187,6 +189,7 @@ Documentation and examples for cloud-init tools %patch52 %patch55 -p0 %patch56 +%patch57 %build %if 0%{?suse_version} && 0%{?suse_version} <= 1315