diff options
| author | Ryan McCabe <rmccabe@redhat.com> | 2017-06-08 13:24:23 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-06-12 12:07:26 -0400 |
| commit | 67bab5bb804e2346673430868935f6bbcdb88f13 (patch) | |
| tree | 39fb2663a0659411852e86bd220ea2cfe680fa25 /tests | |
| parent | b9cd8a82ee41e235df66801a02b2244226bee5ee (diff) | |
| download | vyos-cloud-init-67bab5bb804e2346673430868935f6bbcdb88f13.tar.gz vyos-cloud-init-67bab5bb804e2346673430868935f6bbcdb88f13.zip | |
net: Allow for NetworkManager configuration
In cases where the config json specifies nameserver entries,
if there are interfaces configured to use dhcp, NetworkManager,
if enabled, will clobber the /etc/resolv.conf that cloud-init
has produced, which can break dns. If there are no interfaces
configured to use dhcp, NetworkManager could clobber
/etc/resolv.conf with an empty file.
This patch adds a mechanism for dropping additional configuration
into /etc/NetworkManager/conf.d/ and disables management of
/etc/resolv.conf by NetworkManager when nameserver information is
provided in the config.
LP: #1693251
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unittests/test_net.py | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index 91e5fb59..8edc0b89 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -156,6 +156,13 @@ USERCTL=no ; nameserver 172.19.0.12 """.lstrip()), + ('etc/NetworkManager/conf.d/99-cloud-init.conf', + """ +# Created by cloud-init on instance boot automatically, do not edit. +# +[main] +dns = none +""".lstrip()), ('etc/udev/rules.d/70-persistent-net.rules', "".join(['SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ', 'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n']))] @@ -217,6 +224,13 @@ USERCTL=no ; nameserver 172.19.0.12 """.lstrip()), + ('etc/NetworkManager/conf.d/99-cloud-init.conf', + """ +# Created by cloud-init on instance boot automatically, do not edit. +# +[main] +dns = none +""".lstrip()), ('etc/udev/rules.d/70-persistent-net.rules', "".join(['SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ', 'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n']))] @@ -300,6 +314,13 @@ USERCTL=no ; nameserver 172.19.0.12 """.lstrip()), + ('etc/NetworkManager/conf.d/99-cloud-init.conf', + """ +# Created by cloud-init on instance boot automatically, do not edit. +# +[main] +dns = none +""".lstrip()), ('etc/udev/rules.d/70-persistent-net.rules', "".join(['SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ', 'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n']))] |