[Ovirt-devel] [PATCH server] [REVISED] Install -pxe instead of image.
Jason Guiditta
jguiditt at redhat.com
Fri Mar 20 17:14:30 UTC 2009
ovirt-node-image is required by -pxe, so if we install
that we end up with both, which we need. This installs
them in cobbler, assuming it is local.
Signed-off-by: Jason Guiditta <jguiditt at redhat.com>
---
installer/modules/ovirt/files/cobbler-import | 5 -----
installer/modules/ovirt/manifests/cobbler.pp | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/installer/modules/ovirt/files/cobbler-import b/installer/modules/ovirt/files/cobbler-import
index 752bd85..126cfaf 100644
--- a/installer/modules/ovirt/files/cobbler-import
+++ b/installer/modules/ovirt/files/cobbler-import
@@ -44,11 +44,6 @@ done
node_arch=$(rpm -q --qf "%{arch}" ovirt-node-image)
node_dir=/usr/share/ovirt-node-image
-# Create PXE images from oVirt ISO
-pushd $node_dir
-ovirt-pxe ovirt-node-image.iso
-popd
-
cobbler distro add --name="oVirt-Node-$node_arch" --arch=$node_arch \
--initrd=$node_dir/tftpboot/initrd0.img --kernel=$node_dir/tftpboot/vmlinuz0 \
--kopts="rootflags=loop root=/ovirt-node-image.iso rootfstype=iso9660 ro console=tty0 console=ttyS0,115200n8"
diff --git a/installer/modules/ovirt/manifests/cobbler.pp b/installer/modules/ovirt/manifests/cobbler.pp
index 44e368b..e9c239e 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":
+ package {"ovirt-node-image-pxe":
ensure => installed
}
@@ -119,7 +119,7 @@ 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],Package[livecd-tools]]
+ Service["cobblerd"],Package[ovirt-node-image-pxe],Package[livecd-tools]]
}
file_replacement{"settings_auth_module":
file => "/etc/cobbler/settings",
--
1.5.6.6
More information about the ovirt-devel
mailing list