From dbbabce613aced0ba4182b07edfb842937d7b0cd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 28 2021 16:09:59 +0000
Subject: import cloud-init-20.3-8.el8


---

diff --git a/SOURCES/ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch b/SOURCES/ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch
new file mode 100644
index 0000000..3860cd1
--- /dev/null
+++ b/SOURCES/ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch
@@ -0,0 +1,49 @@
+From 15852ea6958c18e3830aa9244b36cd0decc93b95 Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Thu, 7 Jan 2021 16:51:30 +0100
+Subject: [PATCH] Missing IPV6_AUTOCONF=no to render sysconfig dhcp6 stateful
+ on RHEL (#753)
+
+RH-Author: Eduardo Terrell Ferrari Otubo (eterrell)
+RH-MergeRequest: 29: Missing IPV6_AUTOCONF=no to render sysconfig dhcp6 stateful on RHEL (#753)
+RH-Commit: [1/1] 46943f83071d243bcc61f9d987b4fe7d9cf98596 (eterrell/cloud-init)
+RH-Bugzilla: 1859695
+
+IPV6_AUTOCONF needs to be set to 'no' on RHEL so NetworkManager can
+properly acquire ipv6 address.
+
+rhbz: #1859695
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+---
+ cloudinit/net/sysconfig.py  | 1 +
+ tests/unittests/test_net.py | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
+index 94801a93..1793977d 100644
+--- a/cloudinit/net/sysconfig.py
++++ b/cloudinit/net/sysconfig.py
+@@ -397,6 +397,7 @@ class Renderer(renderer.Renderer):
+                     iface_cfg['BOOTPROTO'] = 'dhcp'
+                     iface_cfg['DHCPV6C'] = True
+                     iface_cfg['IPV6INIT'] = True
++                    iface_cfg['IPV6_AUTOCONF'] = False
+                 else:
+                     iface_cfg['IPV6INIT'] = True
+                     # Configure network settings using DHCPv6
+diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
+index bcd261db..844d5ba8 100644
+--- a/tests/unittests/test_net.py
++++ b/tests/unittests/test_net.py
+@@ -1363,6 +1363,7 @@ NETWORK_CONFIGS = {
+             DEVICE=iface0
+             DHCPV6C=yes
+             IPV6INIT=yes
++            IPV6_AUTOCONF=no
+             IPV6_FORCE_ACCEPT_RA=yes
+             DEVICE=iface0
+             NM_CONTROLLED=no
+-- 
+2.18.4
+
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index da7cc88..d41b445 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -6,7 +6,7 @@
 
 Name:           cloud-init
 Version:        20.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -32,6 +32,8 @@ Patch11: ci-Adding-BOOTPROTO-dhcp-to-render-sysconfig-dhcp6-stat.patch
 Patch12: ci-Fix-unit-failure-of-cloud-final.service-if-NetworkMa.patch
 # For bz#1862967 - [cloud-init]Customize ssh AuthorizedKeysFile causes login failure
 Patch13: ci-ssh_util-handle-non-default-AuthorizedKeysFile-confi.patch
+# For bz#1859695 - [Cloud-init] DHCPv6 assigned address is not added to VM's interface
+Patch14: ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch
 
 BuildArch:      noarch
 
@@ -223,6 +225,11 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Thu Jan 21 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-8.el8
+- ci-Missing-IPV6_AUTOCONF-no-to-render-sysconfig-dhcp6-s.patch [bz#1859695]
+- Resolves: bz#1859695
+  ([Cloud-init] DHCPv6 assigned address is not added to VM's interface)
+
 * Tue Jan 05 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20.3-7.el8
 - ci-Report-full-specific-version-with-cloud-init-version.patch [bz#1898949]
 - Resolves: bz#1898949