rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

- Add cloud-init-no-tempnet-oci.patch (bsc#1161132, bsc#1161133)

Browse Source 
+ 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
This commit is contained in:
Robert Schweikert 2020-01-17 21:33:13 +00:00 committed by Git OBS Bridge
parent d21979739c
commit 5a5220c868
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cloud-init-no-tempnet-oci.patch Normal file
View File

@ -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']

7
cloud-init.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 17 18:55:41 UTC 2020 - Robert Schweikert <rjschwei@suse.com>
- 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 <tchvatal@suse.com> Tue Jan 14 15:14:52 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

3
cloud-init.spec
View File

@ -43,6 +43,8 @@ Patch52: cloud-init-break-resolv-symlink.patch
Patch55: cloud-init-mix-static-dhcp.patch Patch55: cloud-init-mix-static-dhcp.patch
# FIXME no proposed solution # FIXME no proposed solution
Patch56: cloud-init-sysconf-path.patch Patch56: cloud-init-sysconf-path.patch
# FIXME (lp#1860164)
Patch57: cloud-init-no-tempnet-oci.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: filesystem BuildRequires: filesystem
@ -187,6 +189,7 @@ Documentation and examples for cloud-init tools
%patch52 %patch52
%patch55 -p0 %patch55 -p0
%patch56 %patch56
%patch57
%build %build
%if 0%{?suse_version} && 0%{?suse_version} <= 1315 %if 0%{?suse_version} && 0%{?suse_version} <= 1315