Merge "Make management IP address static for WORKER and STORAGE nodes"

puppet-manifests/src/manifests/storage.pp

@@ -14,6 +14,7 @@ include ::platform::dhclient
 include ::platform::partitions
 include ::platform::lvm::storage
 include ::platform::network
+include ::platform::dns
 include ::platform::fstab
 include ::platform::password
 include ::platform::ldap::client

puppet-manifests/src/manifests/worker.pp

@@ -20,6 +20,7 @@ include ::platform::lvm::compute
 include ::platform::compute
 include ::platform::vswitch
 include ::platform::network
+include ::platform::dns
 include ::platform::fstab
 include ::platform::password
 include ::platform::ldap::client

puppet-manifests/src/modules/platform/manifests/dns.pp

@@ -101,7 +101,9 @@ class platform::dns {
   # 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
+  if $::personality == 'controller' {
+    contain ::platform::dns::dnsmasq
+  }
 }