[Ovirt-devel] [PATCH PuppetInstaller] Rework the dependencies so it is package.. stuff.. then servce

[Bryan Kearney]

---
 ace-ovirt/modules/ovirt/manifests/dns.pp |   65 ++++++++++++++++-------------
 1 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/ace-ovirt/modules/ovirt/manifests/dns.pp b/ace-ovirt/modules/ovirt/manifests/dns.pp
index 5bd2f4d..df1d90c 100644
--- a/ace-ovirt/modules/ovirt/manifests/dns.pp
+++ b/ace-ovirt/modules/ovirt/manifests/dns.pp
@@ -20,41 +20,48 @@
 
 define dns::common($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") {
 
-	package {"dnsmasq":
-		ensure => installed,
-		require => [Single_exec["add_dns_server_to_resolv.conf"],File_replacement["dnsmasq_configdir"],
-		File["/etc/dnsmasq.d/ovirt-dns.conf"],File_replacement ["dnsmasq_configdir"]]
-	}
-
-	service {"dnsmasq" :
-                ensure => running,
-                enable => true,
-		require => File["/etc/dnsmasq.d/ovirt-dns.conf"]
-        }
-
-        file {"/etc/dnsmasq.d/ovirt-dns.conf":
-                content => template("ovirt/ovirt-dns.conf.erb"),
-                mode => 644,
-		notify => Service[dnsmasq],
-		#require => Package[dnsmasq]
-        }
-
-	single_exec {"add_dns_server_to_resolv.conf":
-		command => "/bin/sed -e '1i nameserver $prov_ipaddr' -i /etc/resolv.conf",
-		require => [Single_exec["set_hostname"]]
-	}
-
-
-	file_replacement {"dnsmasq_configdir":
-		file => "/etc/dnsmasq.conf",
-		pattern => "^#conf-dir=*$",
-	        replacement => "conf-dir=/etc/dnsmasq.d",
-		notify => Service[dnsmasq]
-	}
-
-	single_exec {"dhclient_config":
-		command => "/bin/echo 'prepend domain-name-servers $prov_ipaddr;' >> /etc/dhclient.conf" 
-	}
+    package {"dnsmasq":
+        ensure => installed,
+        require => [Single_exec["add_dns_server_to_resolv.conf"]]
+    }
+
+    service {"dnsmasq" :
+            ensure => running,
+            enable => true,
+            require => [File["/etc/dnsmasq.d/ovirt-dns.conf"], Package["dnsmasq"]]
+    }
+
+    file {"/etc/dnsmasq.d/ovirt-dns.conf":
+            content => template("ovirt/ovirt-dns.conf.erb"),
+            mode => 644,
+            notify => Service[dnsmasq],
+            require => Package["dnsmasq"]            
+    }
+
+    single_exec {"add_dns_server_to_resolv.conf":
+        command => "/bin/sed -e '1i nameserver $prov_ipaddr' -i /etc/resolv.conf",
+        require => [Single_exec["set_hostname"]]
+    }
+
+
+    file_replacement {"dnsmasq_configdir":
+        file => "/etc/dnsmasq.conf",
+        pattern => "^#conf-dir=*$",
+            replacement => "conf-dir=/etc/dnsmasq.d",
+        notify => Service[dnsmasq],
+        require => Package["dnsmasq"]
+    }
+    
+    file {"/etc/dhclient.conf":
+        ensure => present
+    }
+
+    file_append {"dhclient_config":
+        file => "/etc/dhclient.conf",
+        line => "prepend domain-name-servers $prov_ipaddr",
+        require => [Single_exec["set_hostname"], Package["dnsmasq"], File["/etc/dhclient.conf"]]  ,
+        notify => Service[dnsmasq],   
+    }
 
 }
 
-- 
1.6.0.4