summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorMajor Hayden <major@mhtx.net>2023-05-09 16:27:36 -0500
committerGitHub <noreply@github.com>2023-05-09 16:27:36 -0500
commit0dfe06ba4642fbf64c04b6a4e11400a94eb27a9f (patch)
treee418815a3b8da97cfc01854b57571f79c6b346ed /cloudinit
parente07ad4a570c6588323bac0a5417167e4fd690b28 (diff)
downloadcloud-init-git-0dfe06ba4642fbf64c04b6a4e11400a94eb27a9f.tar.gz
resolv_conf: Allow > 3 nameservers (#2152)
Systems running systemd-resolved or dnsmasq can utlize more than three namervers. Older systems will just use the first three and ignore the rest. Signed-off-by: Major Hayden <major@redhat.com>
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/distros/parsers/resolv_conf.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/cloudinit/distros/parsers/resolv_conf.py b/cloudinit/distros/parsers/resolv_conf.py
index d31ffeb1..0d8dc83f 100644
--- a/cloudinit/distros/parsers/resolv_conf.py
+++ b/cloudinit/distros/parsers/resolv_conf.py
@@ -87,14 +87,6 @@ class ResolvConf:
new_ns = util.uniq_list(new_ns)
if len(new_ns) == len(current_ns):
return current_ns
- if len(current_ns) >= 3:
- LOG.warning(
- "ignoring nameserver %r: adding would "
- "exceed the maximum of "
- "'3' name servers (see resolv.conf(5))",
- ns,
- )
- return current_ns[:3]
self._remove_option("nameserver")
for n in new_ns:
self._contents.append(("option", ["nameserver", n, ""]))