Merge "Ensure puppet dns config done after networking config"
This commit is contained in:
commit
4f816f536b
|
@ -93,8 +93,14 @@ class platform::dns::resolv (
|
||||||
|
|
||||||
|
|
||||||
class platform::dns {
|
class platform::dns {
|
||||||
include ::platform::dns::resolv
|
Anchor['platform::networking'] -> Class[$name]
|
||||||
include ::platform::dns::dnsmasq
|
|
||||||
|
# The "contain" ensures that the resolv and dnsmasq classes are not applied
|
||||||
|
# until the dns class is begun, which will wait for networking to be
|
||||||
|
# complete, as per the anchor dependency above. This is necessary because
|
||||||
|
# the networking configuration can wipe the /etc/resolv.conf file.
|
||||||
|
contain ::platform::dns::resolv
|
||||||
|
contain ::platform::dns::dnsmasq
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue