Ovirt devel - Apr 2009 - [PATCH server] cleanup cobbler and put all cobbler traffic on the admin network

This set the cobbler modules dns/dhcp to dnsmasq, removes a duplicate ip
replacement in /etc/cobbler/settings, and sets the ip address to the admin
network instead of the guest networkwhere it should've been in the first
place.

---
 installer/modules/ovirt/files/modules.conf   |    4 ++--
 installer/modules/ovirt/manifests/cobbler.pp |   16 ++++------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/installer/modules/ovirt/files/modules.conf
b/installer/modules/ovirt/files/modules.conf
index 236ef4c..7bfc2f8 100644
--- a/installer/modules/ovirt/files/modules.conf
+++ b/installer/modules/ovirt/files/modules.conf
@@ -74,7 +74,7 @@ module = authz_allowall
 # https://fedorahosted.org/cobbler/wiki/ManageDns
 
 [dns]
-module = manage_bind
+module = manage_dnsmasq
 
 # chooses the DHCP management engine if manage_dhcp is enabled
 # in /etc/cobbler/settings, which is off by default.
@@ -89,7 +89,7 @@ module = manage_bind
 # https://fedorahosted.org/cobbler/wiki/ManageDhcp
 
 [dhcp]
-module = manage_isc
+module = manage_dnsmasq
 
 
 
diff --git a/installer/modules/ovirt/manifests/cobbler.pp
b/installer/modules/ovirt/manifests/cobbler.pp
index e9c239e..811a0ee 100644
--- a/installer/modules/ovirt/manifests/cobbler.pp
+++ b/installer/modules/ovirt/manifests/cobbler.pp
@@ -80,26 +80,18 @@ class cobbler::bundled {
 		require => Package[cobbler]
         }
 
-	file_replacement{"settings_ip_address":
-		file => "/etc/cobbler/settings",
-		pattern	=> "127.0.0.1",
-		replacement => $ipaddress,
-		notify => Service[cobblerd],
-		require => Package[cobbler]
-	}
-
 	file_replacement{"settings_xml_rpc":
 		file => "/etc/cobbler/settings",
 		pattern	=> "xmlrpc_rw_enabled: 0",
 		replacement => "xmlrpc_rw_enabled: 1",
-		require => File_replacement[settings_ip_address],
+                require =>
[File_replacement[settings_next_server],File_replacement[settings_server]],
 		notify=> Service[cobblerd]
         }
 
 	service {"cobblerd" :
 		ensure => running,
 		enable => true,
-		require => File_replacement[settings_ip_address]
+                require =>
[File_replacement[settings_next_server],File_replacement[settings_server]],
 	}
 
     file {"/etc/cobbler/modules.conf":
@@ -132,7 +124,7 @@ class cobbler::bundled {
         file_replacement{"settings_server":
                 file => "/etc/cobbler/settings",
                 pattern => "server: 127.0.0.1",
-                replacement => "server: $guest_ipaddr",
+                replacement => "server: $admin_ipaddr",
                 require => Package[cobbler],
                 notify => Service[cobblerd]
         }
@@ -140,7 +132,7 @@ class cobbler::bundled {
         file_replacement{"settings_next_server":
                 file => "/etc/cobbler/settings",
                 pattern => "next_server: 127.0.0.1",
-                replacement => "next_server: $guest_ipaddr",
+                replacement => "next_server: $admin_ipaddr",
                 require => Package[cobbler],
                 notify => Service[cobblerd]
         }
-- 
1.6.0.6

Joey Boggs wrote:
> This set the cobbler modules dns/dhcp to dnsmasq, removes a duplicate ip
replacement in /etc/cobbler/settings, and sets the ip address to the admin
network instead of the guest networkwhere it should've been in the first
place.
>
> ---
>  installer/modules/ovirt/files/modules.conf   |    4 ++--
>  installer/modules/ovirt/manifests/cobbler.pp |   16 ++++------------
>  2 files changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/installer/modules/ovirt/files/modules.conf
b/installer/modules/ovirt/files/modules.conf
> index 236ef4c..7bfc2f8 100644
> --- a/installer/modules/ovirt/files/modules.conf
> +++ b/installer/modules/ovirt/files/modules.conf
> @@ -74,7 +74,7 @@ module = authz_allowall
>  # https://fedorahosted.org/cobbler/wiki/ManageDns
>  
>  [dns]
> -module = manage_bind
> +module = manage_dnsmasq
>  
>  # chooses the DHCP management engine if manage_dhcp is enabled
>  # in /etc/cobbler/settings, which is off by default.
> @@ -89,7 +89,7 @@ module = manage_bind
>  # https://fedorahosted.org/cobbler/wiki/ManageDhcp
>  
>  [dhcp]
> -module = manage_isc
> +module = manage_dnsmasq
>  
>   
You guys are using the DHCP+DNS management features now (and these are 
turned on in settings)?

I should point out -- most folks use ISC+BIND instead here. 

When we do the network objects feature for 2.0 (which will possibly 
impact the way we template out those configs), it may no longer be 
supported as we have to dual maintain it and ISC/BIND seems to be the 
proper "production" option as dnsmasq says it is for "small
networks".