Ovirt devel - Mar 2009 - [PATCH server] remove reliance on ovirt-pxe and clean up one more q/a installer variable problem

---
 installer/bin/ovirt-installer                |    2 +-
 installer/modules/ovirt/manifests/cobbler.pp |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/installer/bin/ovirt-installer b/installer/bin/ovirt-installer
index f25998b..2d88886 100755
--- a/installer/bin/ovirt-installer
+++ b/installer/bin/ovirt-installer
@@ -215,7 +215,7 @@ if dhcp_setup == "n"
     dhcp_start = prompt_for_answer("Enter the dhcp pool start address
(example: 3):", :regex => OCTET)
     dhcp_stop = prompt_for_answer("Enter the dhcp pool end addess
(example: 100):", :regex => OCTET)
     dhcp_domain = prompt_for_answer("Enter the dhcp domain you wish to use
(example: example.com):", :default => dnsdomainname.chomp, :regex =>
IP_OR_FQDN)
-    admin_dns_server = admin_ip.scan(/\s*inet addr:([\d.]+)/)
+    admin_dns_server = interfaces[admin_dev]
     admin_network_gateway = prompt_for_answer("Enter the network gateway
for your Admin network (example: 192.168.50.254):", :default =>
default_gw.chomp, :regex => IP_OR_FQDN)
     tftp_setup = prompt_yes_no("Provide pxe/tftp capability?")
 end
diff --git a/installer/modules/ovirt/manifests/cobbler.pp
b/installer/modules/ovirt/manifests/cobbler.pp
index e9c239e..1e03de9 100644
--- a/installer/modules/ovirt/manifests/cobbler.pp
+++ b/installer/modules/ovirt/manifests/cobbler.pp
@@ -61,7 +61,7 @@ class cobbler::bundled {
 		ensure => installed
 	}
 
-        package {"ovirt-node-image-pxe":
+        package {"ovirt-node-image":
                 ensure => installed
         }
 
@@ -118,8 +118,8 @@ class cobbler::bundled {
 
     single_exec {"cobbler-import":
         command => "/usr/sbin/cobbler-import >>
/var/log/cobbler-import.log 2>&1",
-        require => [File["/usr/sbin/cobbler-import"],
-                  
Service["cobblerd"],Package[ovirt-node-image-pxe],Package[livecd-tools]]
+        require =>
[File["/usr/sbin/cobbler-import"],Service["cobblerd"],Package[ovirt-node-image],
+                   Package[livecd-tools],Single_exec[node_image_iso_to_pxe]]
     }
         file_replacement{"settings_auth_module":
                 file => "/etc/cobbler/settings",
@@ -145,6 +145,11 @@ class cobbler::bundled {
                 notify => Service[cobblerd]
         }
 
+        single_exec { "node_image_iso_to_pxe" :
+                cwd => "/usr/share/ovirt-node-image/",
+                command => "/usr/bin/livecd-iso-to-pxeboot
ovirt-node-image.iso; /usr/bin/cobbler sync",
+                require =>
[Package[ovirt-node-image],Package[livecd-tools],Package[cobbler]]
+        }
 }
 
 class cobbler::remote {
-- 
1.6.0.6

> - ? ?admin_dns_server = admin_ip.scan(/\s*inet addr:([\d.]+)/)
> + ? ?admin_dns_server = interfaces[admin_dev]
is that "clean up one more q/a installer variable problem" ?  Please
explain and put in a separate commit :)
> + ? ? ? ?single_exec { "node_image_iso_to_pxe" :
> + ? ? ? ? ? ? ? ?cwd => "/usr/share/ovirt-node-image/",
> + ? ? ? ? ? ? ? ?command => "/usr/bin/livecd-iso-to-pxeboot
ovirt-node-image.iso; /usr/bin/cobbler sync",
> + ? ? ? ? ? ? ? ?require =>
[Package[ovirt-node-image],Package[livecd-tools],Package[cobbler]]
> + ? ? ? ?}
would be good if this could be exposed, so that user can run it when
ovirt-node-image is updated