rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

Fix errors in network sysconfig handling

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1389530
https://bugs.launchpad.net/cloud-init/+bug/1665441
https://git.launchpad.net/cloud-init/commit/?id=f81d6c7bde2af206d449de593b35773068270c84
This commit is contained in:
Garrett Holmstrom 2017-03-14 14:37:49 -07:00
parent 27b10acec6
commit c416b9ac65
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cloud-init-0.7.9-sysconfig-iface.patch Normal file
View File

@ -0,0 +1,17 @@
Index: cloud-init-0.7.9/cloudinit/net/sysconfig.py
===================================================================
--- cloud-init-0.7.9.orig/cloudinit/net/sysconfig.py
+++ cloud-init-0.7.9/cloudinit/net/sysconfig.py
@@ -282,10 +282,10 @@ class Renderer(renderer.Renderer):
cls._render_subnet(iface_cfg, route_cfg, iface_subnets[0])
elif len(iface_subnets) > 1:
for i, iface_subnet in enumerate(iface_subnets,
- start=len(iface.children)):
+ start=len(iface_cfg.children)):
iface_sub_cfg = iface_cfg.copy()
iface_sub_cfg.name = "%s:%s" % (iface_name, i)
- iface.children.append(iface_sub_cfg)
+ iface_cfg.children.append(iface_sub_cfg)
cls._render_subnet(iface_sub_cfg, route_cfg, iface_subnet)
@classmethod

7
cloud-init.spec
View File

@ -49,6 +49,12 @@ Patch13: cloud-init-0.7.9-systemd-cloud-init.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1428492 # https://bugzilla.redhat.com/show_bug.cgi?id=1428492
Patch14: cloud-init-0.7.9-systemd-cloud-final.patch Patch14: cloud-init-0.7.9-systemd-cloud-final.patch
# Fix errors in network sysconfig handling
# https://bugzilla.redhat.com/show_bug.cgi?id=1389530
# https://bugs.launchpad.net/cloud-init/+bug/1665441
# https://git.launchpad.net/cloud-init/commit/?id=f81d6c7bde2af206d449de593b35773068270c84
Patch15: cloud-init-0.7.9-sysconfig-iface.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
@ -188,6 +194,7 @@ nosetests-%{python3_version} tests/unittests/ \
* Tue Mar 14 2017 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.9-4 * Tue Mar 14 2017 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.9-4
- Fixed systemd dependency cycle with cloud-final and os-collect-config [RH:1420946, RH:1428492] - Fixed systemd dependency cycle with cloud-final and os-collect-config [RH:1420946, RH:1428492]
- Fixed systemd dependency cycle with cloud-init and multi-user.target [RH:1428492, RH:1430511] - Fixed systemd dependency cycle with cloud-init and multi-user.target [RH:1428492, RH:1430511]
- Fixed errors in network sysconfig handling [RH:1389530, LP:1665441]
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-3 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild