[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at v0.0.3-275-gb0ebbfb
Michael DeHaan
mdehaan at redhat.com
Wed Aug 29 21:51:39 UTC 2007
Hello,
This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.
Updating branch, master,
via b0ebbfbc0376e17f42c7233bc1eaddf9507a872b (commit)
from 19eafe3cb4a7b24668f76bc77475e0556c972543 (commit)
- Log -----------------------------------------------------------------
commit b0ebbfbc0376e17f42c7233bc1eaddf9507a872b
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date: Wed Aug 29 17:49:00 2007 -0400
Changes to add some additional packages for bare-metal bootstrapping
-----------------------------------------------------------------------
Diffstat:
service/kickstart/kick-fc6.ks | 4 ++++
service/modules/provisioning.py | 8 ++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/service/kickstart/kick-fc6.ks b/service/kickstart/kick-fc6.ks
index e75dbf3..7187842 100755
--- a/service/kickstart/kick-fc6.ks
+++ b/service/kickstart/kick-fc6.ks
@@ -58,6 +58,7 @@ EOF
%packages
ntp
+brctl
$node_common_packages
$node_virt_packages
$node_bare_packages
@@ -65,8 +66,11 @@ $node_bare_packages
%post
/usr/sbin/ntpdate -u $server_name
/usr/bin/vf_register $server_param $token_param $network_param
+# if installed, otherwise it's ok if this fails...
+/sbin/chkconfig --level 345 libvirtd on
/sbin/chkconfig --level 345 puppet on
/sbin/chkconfig --level 345 virt-factory-node-server on
+
$yum_config_stanza
$kickstart_done
diff --git a/service/modules/provisioning.py b/service/modules/provisioning.py
index ccbb658..af68fa2 100755
--- a/service/modules/provisioning.py
+++ b/service/modules/provisioning.py
@@ -270,13 +270,17 @@ class CobblerTranslatedProfile:
# FIXME: currently not used...
ks_meta["node_virt_packages"] = ""
- ks_meta["node_bare_packages"] = ""
+
+ if distribution_name.find("xen") != -1:
+ ks_meta["node_bare_packages"] = "libvirt\nxend\n"
+ else:
+ ks_meta["node_bare_packages"] = "libvirt\nqemu\nkvm\n"
ks_meta["network_param"] = ""
if from_db.has_key("is_container") and from_db["is_container"] != 0:
# qemu won't be installed for Xen but it's ok if that command fails...
# we do want to make sure libvirt is started though
- ks_meta["extra_post_magic"] = "/sbin/chkconfig 345 qemu on\n" + "/sbin/chkconfig 345 libvirtd on\n"
+ ks_meta["extra_post_magic"] = "/sbin/chkconfig 345 qemu on\n"
ks_meta["network_param"] = "--allow-bridge-config"
ks_meta["cryptpw"] = "$1$mF86/UHC$WvcIcX2t6crBz2onWxyac." # FIXME
hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
19eafe3cb4a7b24668f76bc77475e0556c972543 \
b0ebbfbc0376e17f42c7233bc1eaddf9507a872b
More information about the Et-mgmt-commits-list
mailing list