cfd307
diff -rup cloud-init-17.1.orig/cloudinit/net/sysconfig.py cloud-init-17.1/cloudinit/net/sysconfig.py
cfd307
--- cloud-init-17.1.orig/cloudinit/net/sysconfig.py	2018-03-26 19:22:35.693111559 +0200
cfd307
+++ cloud-init-17.1/cloudinit/net/sysconfig.py	2018-03-26 23:47:41.424803588 +0200
cfd307
@@ -586,7 +586,17 @@ class Renderer(renderer.Renderer):
cfd307
 
cfd307
         # always write /etc/sysconfig/network configuration
cfd307
         sysconfig_path = util.target_path(target, "etc/sysconfig/network")
cfd307
-        netcfg = [_make_header(), 'NETWORKING=yes']
cfd307
+        # Make sure that existing lines, other than overriding ones, remain
cfd307
+        netcfg = []
cfd307
+        for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
cfd307
+            if 'cloud-init' in line:
cfd307
+                break
cfd307
+            if not line.startswith(('NETWORKING=',
cfd307
+                                    'IPV6_AUTOCONF=',
cfd307
+                                    'NETWORKING_IPV6=')):
cfd307
+                netcfg.append(line)
cfd307
+        # Now generate the cloud-init portion of sysconfig/network
cfd307
+        netcfg.extend([_make_header(), 'NETWORKING=yes'])
cfd307
         if network_state.use_ipv6:
cfd307
             netcfg.append('NETWORKING_IPV6=yes')
cfd307
             netcfg.append('IPV6_AUTOCONF=no')
cfd307
diff -rup cloud-init-17.1.orig/tests/unittests/test_distros/test_netconfig.py cloud-init-17.1/tests/unittests/test_distros/test_netconfig.py
cfd307
--- cloud-init-17.1.orig/tests/unittests/test_distros/test_netconfig.py	2018-03-26 19:22:35.717111557 +0200
cfd307
+++ cloud-init-17.1/tests/unittests/test_distros/test_netconfig.py	2018-03-26 22:08:25.008717651 +0200
cfd307
@@ -384,6 +384,82 @@ hn0: flags=8843
cfd307
             buf.write(content)
cfd307
             write_bufs[filename] = buf
cfd307
 
cfd307
+        def replace_load_file(filename, *args, **kwargs):
cfd307
+            if filename == '/etc/sysconfig/network':
cfd307
+                return 'TEST=yes\nTEST2=yes'
cfd307
+            else:
cfd307
+                return ''
cfd307
+
cfd307
+        with ExitStack() as mocks:
cfd307
+            mocks.enter_context(
cfd307
+                mock.patch.object(util, 'write_file', replace_write))
cfd307
+            mocks.enter_context(
cfd307
+                mock.patch.object(util, 'load_file', replace_load_file))
cfd307
+            mocks.enter_context(
cfd307
+                mock.patch.object(os.path, 'isfile', return_value=False))
cfd307
+
cfd307
+            rh_distro.apply_network(BASE_NET_CFG, False)
cfd307
+
cfd307
+            self.assertEqual(len(write_bufs), 4)
cfd307
+            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-lo',
cfd307
+                          write_bufs)
cfd307
+            write_buf = write_bufs['/etc/sysconfig/network-scripts/ifcfg-lo']
cfd307
+            expected_buf = '''
cfd307
+DEVICE="lo"
cfd307
+ONBOOT=yes
cfd307
+'''
cfd307
+            self.assertCfgEquals(expected_buf, str(write_buf))
cfd307
+            self.assertEqual(write_buf.mode, 0o644)
cfd307
+
cfd307
+            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-eth0',
cfd307
+                          write_bufs)
cfd307
+            write_buf = write_bufs['/etc/sysconfig/network-scripts/ifcfg-eth0']
cfd307
+            expected_buf = '''
cfd307
+DEVICE="eth0"
cfd307
+BOOTPROTO="static"
cfd307
+NETMASK="255.255.255.0"
cfd307
+IPADDR="192.168.1.5"
cfd307
+ONBOOT=yes
cfd307
+GATEWAY="192.168.1.254"
cfd307
+BROADCAST="192.168.1.0"
cfd307
+'''
cfd307
+            self.assertCfgEquals(expected_buf, str(write_buf))
cfd307
+            self.assertEqual(write_buf.mode, 0o644)
cfd307
+
cfd307
+            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-eth1',
cfd307
+                          write_bufs)
cfd307
+            write_buf = write_bufs['/etc/sysconfig/network-scripts/ifcfg-eth1']
cfd307
+            expected_buf = '''
cfd307
+DEVICE="eth1"
cfd307
+BOOTPROTO="dhcp"
cfd307
+ONBOOT=yes
cfd307
+'''
cfd307
+            self.assertCfgEquals(expected_buf, str(write_buf))
cfd307
+            self.assertEqual(write_buf.mode, 0o644)
cfd307
+
cfd307
+            self.assertIn('/etc/sysconfig/network', write_bufs)
cfd307
+            write_buf = write_bufs['/etc/sysconfig/network']
cfd307
+            expected_buf = '''
cfd307
+# Created by cloud-init v. 0.7
cfd307
+NETWORKING=yes
cfd307
+TEST=yes
cfd307
+TEST2=yes
cfd307
+'''
cfd307
+            self.assertCfgEquals(expected_buf, str(write_buf))
cfd307
+            self.assertEqual(write_buf.mode, 0o644)
cfd307
+
cfd307
+    def test_simple_write_rh_no_extra(self):
cfd307
+        rh_distro = self._get_distro('rhel')
cfd307
+
cfd307
+        write_bufs = {}
cfd307
+
cfd307
+        def replace_write(filename, content, mode=0o644, omode="wb"):
cfd307
+            buf = WriteBuffer()
cfd307
+            buf.mode = mode
cfd307
+            buf.omode = omode
cfd307
+            buf.write(content)
cfd307
+            write_bufs[filename] = buf
cfd307
+
cfd307
         with ExitStack() as mocks:
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(util, 'write_file', replace_write))
cfd307
@@ -453,6 +529,12 @@ NETWORKING=yes
cfd307
             buf.write(content)
cfd307
             write_bufs[filename] = buf
cfd307
 
cfd307
+        def replace_load_file(filename, *args, **kwargs):
cfd307
+            if filename == '/etc/sysconfig/network':
cfd307
+                return 'TEST=yes\nTEST2=yes'
cfd307
+            else:
cfd307
+                return ''
cfd307
+
cfd307
         with ExitStack() as mocks:
cfd307
             # sysconfig availability checks
cfd307
             mocks.enter_context(
cfd307
@@ -460,7 +542,7 @@ NETWORKING=yes
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(util, 'write_file', replace_write))
cfd307
             mocks.enter_context(
cfd307
-                mock.patch.object(util, 'load_file', return_value=''))
cfd307
+                mock.patch.object(util, 'load_file', replace_load_file))
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(os.path, 'isfile', return_value=True))
cfd307
 
cfd307
@@ -509,6 +591,8 @@ USERCTL=no
cfd307
             expected_buf = '''
cfd307
 # Created by cloud-init v. 0.7
cfd307
 NETWORKING=yes
cfd307
+TEST=yes
cfd307
+TEST2=yes
cfd307
 '''
cfd307
             self.assertCfgEquals(expected_buf, str(write_buf))
cfd307
             self.assertEqual(write_buf.mode, 0o644)
cfd307
@@ -525,13 +609,20 @@ NETWORKING=yes
cfd307
             buf.write(content)
cfd307
             write_bufs[filename] = buf
cfd307
 
cfd307
+        def replace_load_file(filename, *args, **kwargs):
cfd307
+            if filename == '/etc/sysconfig/network':
cfd307
+                return 'TEST=yes\nTEST2=yes'
cfd307
+            else:
cfd307
+                return ''
cfd307
+
cfd307
         with ExitStack() as mocks:
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(util, 'write_file', replace_write))
cfd307
             mocks.enter_context(
cfd307
-                mock.patch.object(util, 'load_file', return_value=''))
cfd307
+                mock.patch.object(util, 'load_file', replace_load_file))
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(os.path, 'isfile', return_value=False))
cfd307
+
cfd307
             rh_distro.apply_network(BASE_NET_CFG_IPV6, False)
cfd307
 
cfd307
             self.assertEqual(len(write_bufs), 4)
cfd307
@@ -587,6 +678,8 @@ IPV6_DEFAULTGW="2607:f0d0:1002:0011::1"
cfd307
 NETWORKING=yes
cfd307
 NETWORKING_IPV6=yes
cfd307
 IPV6_AUTOCONF=no
cfd307
+TEST=yes
cfd307
+TEST2=yes
cfd307
 '''
cfd307
             self.assertCfgEquals(expected_buf, str(write_buf))
cfd307
             self.assertEqual(write_buf.mode, 0o644)
cfd307
@@ -604,13 +697,19 @@ IPV6_AUTOCONF=no
cfd307
             buf.write(content)
cfd307
             write_bufs[filename] = buf
cfd307
 
cfd307
+        def replace_load_file(filename, *args, **kwargs):
cfd307
+            if filename == '/etc/sysconfig/network':
cfd307
+                return 'TEST=yes\nTEST2=yes'
cfd307
+            else:
cfd307
+                return ''
cfd307
+
cfd307
         with ExitStack() as mocks:
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(util, 'which', return_value=True))
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(util, 'write_file', replace_write))
cfd307
             mocks.enter_context(
cfd307
-                mock.patch.object(util, 'load_file', return_value=''))
cfd307
+                mock.patch.object(util, 'load_file', replace_load_file))
cfd307
             mocks.enter_context(
cfd307
                 mock.patch.object(os.path, 'isfile', return_value=True))
cfd307
 
cfd307
@@ -658,6 +757,8 @@ USERCTL=no
cfd307
 NETWORKING=yes
cfd307
 NETWORKING_IPV6=yes
cfd307
 IPV6_AUTOCONF=no
cfd307
+TEST=yes
cfd307
+TEST2=yes
cfd307
 '''
cfd307
             self.assertCfgEquals(expected_buf, str(write_buf))
cfd307
             self.assertEqual(write_buf.mode, 0o644)