Update with trunk and resolve conflicts

1 files changed, 18 insertions, 6 deletions

diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index d01124e3..d5cc15fe 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -72,6 +72,7 @@ class Distro(distros.Distro):
         nameservers = []
         searchservers = []
         dev_names = entries.keys()
+        use_ipv6 = False
         for (dev, info) in entries.iteritems():
             net_fn = self.network_script_tpl % (dev)
             net_cfg = {
@@ -84,6 +85,13 @@ class Distro(distros.Distro):
                 'MACADDR': info.get('hwaddress'),
                 'ONBOOT': _make_sysconfig_bool(info.get('auto')),
             }
+            if info.get('inet6'):
+                use_ipv6 = True
+                net_cfg.update({
+                    'IPV6INIT': _make_sysconfig_bool(True),
+                    'IPV6ADDR': info.get('ipv6').get('address'),
+                    'IPV6_DEFAULTGW': info.get('ipv6').get('gateway'),
+            })
             rhel_util.update_sysconfig_file(net_fn, net_cfg)
             if 'dns-nameservers' in info:
                 nameservers.extend(info['dns-nameservers'])
@@ -96,10 +104,14 @@ class Distro(distros.Distro):
             net_cfg = {
                 'NETWORKING': _make_sysconfig_bool(True),
             }
+            # If IPv6 interface present, enable ipv6 networking
+            if use_ipv6:
+                net_cfg['NETWORKING_IPV6'] = _make_sysconfig_bool(True)
+                net_cfg['IPV6_AUTOCONF'] = _make_sysconfig_bool(False)
             rhel_util.update_sysconfig_file(self.network_conf_fn, net_cfg)
         return dev_names
 
-    def _dist_uses_systemd(self):
+    def uses_systemd(self):
         # Fedora 18 and RHEL 7 were the first adopters in their series
         (dist, vers) = util.system_info()['dist'][:2]
         major = (int)(vers.split('.')[0])
@@ -107,7 +119,7 @@ class Distro(distros.Distro):
                 or (dist.startswith('Fedora') and major >= 18))
 
     def apply_locale(self, locale, out_fn=None):
-        if self._dist_uses_systemd():
+        if self.uses_systemd():
             if not out_fn:
                 out_fn = self.systemd_locale_conf_fn
             out_fn = self.systemd_locale_conf_fn
@@ -120,7 +132,7 @@ class Distro(distros.Distro):
         rhel_util.update_sysconfig_file(out_fn, locale_cfg)
 
     def _write_hostname(self, hostname, out_fn):
-        if self._dist_uses_systemd():
+        if self.uses_systemd():
             util.subp(['hostnamectl', 'set-hostname', str(hostname)])
         else:
             host_cfg = {
@@ -136,14 +148,14 @@ class Distro(distros.Distro):
         return hostname
 
     def _read_system_hostname(self):
-        if self._dist_uses_systemd():
+        if self.uses_systemd():
             host_fn = self.systemd_hostname_conf_fn
         else:
             host_fn = self.hostname_conf_fn
         return (host_fn, self._read_hostname(host_fn))
 
     def _read_hostname(self, filename, default=None):
-        if self._dist_uses_systemd():
+        if self.uses_systemd():
             (out, _err) = util.subp(['hostname'])
             if len(out):
                 return out
@@ -164,7 +176,7 @@ class Distro(distros.Distro):
 
     def set_timezone(self, tz):
         tz_file = self._find_tz_file(tz)
-        if self._dist_uses_systemd():
+        if self.uses_systemd():
             # Currently, timedatectl complains if invoked during startup
             # so for compatibility, create the link manually.
             util.del_file(self.tz_local_fn)