[2.19] preinstall: Add nodelocaldns to supersede_nameserver if enabled (#9324)
When a machine that use dhclient and resolvconf reboots, this will make /etc/resolv.conf remain close to the one before rebootpull/9417/head
parent
1026b5974f
commit
63e3f4dea9
|
@ -190,7 +190,7 @@
|
||||||
nameserverentries: |-
|
nameserverentries: |-
|
||||||
{{ ( ( [nodelocaldns_ip] if enable_nodelocaldns else []) + coredns_server|d([]) + nameservers|d([]) + cloud_resolver|d([]) + configured_nameservers|d([])) | unique | join(',') }}
|
{{ ( ( [nodelocaldns_ip] if enable_nodelocaldns else []) + coredns_server|d([]) + nameservers|d([]) + cloud_resolver|d([]) + configured_nameservers|d([])) | unique | join(',') }}
|
||||||
supersede_nameserver:
|
supersede_nameserver:
|
||||||
supersede domain-name-servers {{ ( coredns_server|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(', ') }};
|
supersede domain-name-servers {{ ( ( [nodelocaldns_ip] if enable_nodelocaldns else []) + coredns_server|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(', ') }};
|
||||||
when: not dns_early or dns_late
|
when: not dns_early or dns_late
|
||||||
|
|
||||||
# This task should run instead of the above task when cluster/nodelocal DNS hasn't
|
# This task should run instead of the above task when cluster/nodelocal DNS hasn't
|
||||||
|
|
Loading…
Reference in New Issue