starlingx
/
config
Code Issues Proposed changes

Merge "Ensure puppet dns config done after networking config"

This commit is contained in:
Zuul 2019-01-28 21:40:32 +00:00 committed by Gerrit Code Review
parent 91f88e9afc c4f63232dc
commit 4f816f536b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet-manifests/src/modules/platform/manifests/dns.pp
View File

@ -93,8 +93,14 @@ class platform::dns::resolv (
class platform::dns {
include ::platform::dns::resolv
include ::platform::dns::dnsmasq
Anchor['platform::networking'] -> Class[$name]
# 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
}