[Ovirt-devel] [PATCH server] pass non local dns requests upstream, set hostname permanently

[Joey Boggs]

This is from today testing, removing no-resolv has been shown to work, the augeas addition should be checked though

---
 installer/modules/ovirt/manifests/dns.pp           |    7 +++++++
 .../modules/ovirt/templates/ovirt-dhcp.conf.erb    |    1 -
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/installer/modules/ovirt/manifests/dns.pp b/installer/modules/ovirt/manifests/dns.pp
index 54e7dac..cbe706a 100644
--- a/installer/modules/ovirt/manifests/dns.pp
+++ b/installer/modules/ovirt/manifests/dns.pp
@@ -76,6 +76,13 @@ define dns::bundled($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="")
 		command => "/bin/echo $mgmt_ipaddr $ipa_host >> /etc/hosts",
 		notify => [Service[dnsmasq], Single_exec["add_dns_server_to_resolv.conf"]]
 	}
+
+	augeas{"set_system_hostname":
+	    context => "/files/etc/sysconfig/network",
+	    changes => [
+	        "set HOSTNAME $ipa_host"
+        ]
+    }
 }
 
 define dns::remote($mgmt_ipaddr="", $prov_ipaddr="",$mgmt_dev="",$prov_dev="") {
diff --git a/installer/modules/ovirt/templates/ovirt-dhcp.conf.erb b/installer/modules/ovirt/templates/ovirt-dhcp.conf.erb
index e10db40..4569f77 100644
--- a/installer/modules/ovirt/templates/ovirt-dhcp.conf.erb
+++ b/installer/modules/ovirt/templates/ovirt-dhcp.conf.erb
@@ -4,6 +4,5 @@ domain=<%= dhcp_domain %>
 dhcp-option=option:router,<%= prov_network_gateway %>
 dhcp-option=option:ntp-server,<%= ntp_server %>
 dhcp-option=12
-no-resolv
 local=/<%= dhcp_domain %>/
 server=<%= prov_dns_server %>
-- 
1.6.0.6