[Ovirt-devel] [PATCH PuppetInstaller] Always do basic DNS setup

[Bryan Kearney]

---
 ace-ovirt/modules/ovirt/manifests/dns.pp |   23 +++++++++++++++--------
 ace-ovirt/modules/ovirt/ovirt-installer  |    4 +++-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ace-ovirt/modules/ovirt/manifests/dns.pp b/ace-ovirt/modules/ovirt/manifests/dns.pp
index 8665b99..5bd2f4d 100644
--- a/ace-ovirt/modules/ovirt/manifests/dns.pp
+++ b/ace-ovirt/modules/ovirt/manifests/dns.pp
@@ -18,8 +18,7 @@
 # Author: Joey Boggs <jboggs at redhat.com>
 #--
 
-
-define dns::bundled($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") {
+define dns::common($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") {
 
 	package {"dnsmasq":
 		ensure => installed,
@@ -42,13 +41,9 @@ define dns::bundled($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="")
 
 	single_exec {"add_dns_server_to_resolv.conf":
 		command => "/bin/sed -e '1i nameserver $prov_ipaddr' -i /etc/resolv.conf",
-		require => [Single_exec["add_mgmt_server_to_etc_hosts"],Single_exec["set_hostname"]]
+		require => [Single_exec["set_hostname"]]
 	}
 
-	single_exec {"add_mgmt_server_to_etc_hosts":
-		command => "/bin/echo $mgmt_ipaddr $ipa_host >> /etc/hosts",
-		notify => Service[dnsmasq]
-	}
 
 	file_replacement {"dnsmasq_configdir":
 		file => "/etc/dnsmasq.conf",
@@ -63,7 +58,17 @@ define dns::bundled($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="")
 
 }
 
-class dns::remote {
+define dns::bundled($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") {
+
+    dns::common{"setup": mgmt_ipaddr=>$mgmt_ipaddr, prov_ipaddr=>$prov_ipaddr, mgmt_dev=>$mgmt_dev, prov_dev=>$prov_dev}
+    
+	single_exec {"add_mgmt_server_to_etc_hosts":
+		command => "/bin/echo $mgmt_ipaddr $ipa_host >> /etc/hosts",
+		notify => [Service[dnsmasq], Single_exec["add_dns_server_to_resolv.conf"]]
+	}
+}
+
+define dns::remote($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") {
 
 #    On the pxe server you will need to ensure that the
 #    next server option points to the ip address of the tftp server
@@ -81,4 +86,6 @@ class dns::remote {
 # Also A records must be present for each oVirt node. Without this they are unable
 # to determine their hostname and locate the management server.
 
+    dns::common{"setup": mgmt_ipaddr=>$mgmt_ipaddr, prov_ipaddr=>$prov_ipaddr, mgmt_dev=>$mgmt_dev, prov_dev=>$prov_dev}
+    
 }
diff --git a/ace-ovirt/modules/ovirt/ovirt-installer b/ace-ovirt/modules/ovirt/ovirt-installer
index 7d7b9d8..902b916 100755
--- a/ace-ovirt/modules/ovirt/ovirt-installer
+++ b/ace-ovirt/modules/ovirt/ovirt-installer
@@ -123,16 +123,18 @@ mgmt_ipaddr= mgmt_ip.scan(/\s*inet addr:([\d.]+)/)
 prov_ip = `ifconfig #{prov_dev}`
 prov_ipaddr= prov_ip.scan(/\s*inet addr:([\d.]+)/)
 
-if dns_servers == "n"
 config_file.write "# dns configuration\n"
 config_file.write "$mgmt_ipaddr = '#{mgmt_ipaddr}'\n"
 config_file.write "$prov_ipaddr = '#{prov_ipaddr}'\n"
 config_file.write "$ovirt_host = '#{ovirt_host}'\n"
 config_file.write "$ipa_host = '#{ipa_host}'\n\n"
+
+if dns_servers == "n"
 config_file.write "dns::bundled{setup: mgmt_ipaddr=> $mgmt_ipaddr, prov_ipaddr=> $prov_ipaddr, mgmt_dev => '#{mgmt_dev}', prov_dev => '#{prov_dev}'}\n\n"
 end
 
 if dns_servers == "y"
+config_file.write "dns::remote{setup: mgmt_ipaddr=> $mgmt_ipaddr, prov_ipaddr=> $prov_ipaddr, mgmt_dev => '#{mgmt_dev}', prov_dev => '#{prov_dev}'}\n\n"
 host_lookup = Socket.getaddrinfo(ipa_host,nil)
 hostip = host_lookup[1][3]
 if hostip.to_s != mgmt_ipaddr.to_s
-- 
1.6.0.4