[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 8f3f0798c093f2d4c1c50c8c71586c74145f8759

Michael DeHaan mdehaan at redhat.com
Tue May 1 21:29:03 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  8f3f0798c093f2d4c1c50c8c71586c74145f8759 (commit)
      from  9f1d4c65da1bd8db8ad5a46beb39c279409e08c5 (commit)

- Log -----------------------------------------------------------------
commit 8f3f0798c093f2d4c1c50c8c71586c74145f8759
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Tue May 1 17:30:26 2007 -0400

    Add cobbler hooks back into vf provisioning/kickstart for yum integration.
    vf_repo is still handled somewhat manually by not linking it to the
    profile.  This can likely change.
-----------------------------------------------------------------------

Diffstat:
 service/kickstart/kick-fc6.ks   |    1 +
 service/modules/provisioning.py |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/service/kickstart/kick-fc6.ks b/service/kickstart/kick-fc6.ks
index 3e5bac2..b9c2b51 100755
--- a/service/kickstart/kick-fc6.ks
+++ b/service/kickstart/kick-fc6.ks
@@ -68,6 +68,7 @@ $node_bare_packages
 /sbin/chkconfig --level 345 puppetd on
 /sbin/chkconfig --level 345 virt-factory-node-server-daemon on
 # FIXME: configure node to use vf_repo here
+$yum_config_stanza
 $kickstart_done
 
 
diff --git a/service/modules/provisioning.py b/service/modules/provisioning.py
index 3d51f5c..39517df 100755
--- a/service/modules/provisioning.py
+++ b/service/modules/provisioning.py
@@ -231,7 +231,7 @@ class CobblerTranslatedProfile:
 
        ks_meta["cryptpw"]              = "$1$mF86/UHC$WvcIcX2t6crBz2onWxyac." # FIXME
        ks_meta["token_param"]          = "--token=UNSET" # intentional, system can override
-       ks_meta["repo_line"]  = "repo --name=vf_repo --baseurl http://%s/cobbler/repo_mirror/vf_repo" % vf_config["this_server"]["address"]
+       ks_meta["repo_line"]  = "repo --name=vf_repo --baseurl http://%s/cobbler/repo_mirror/vf_repo" % vf_config["this_server"]["address"] + "\n$yum_repo_stanza\n"
        ks_meta["server_param"] = "--server=http://%s:5150" % vf_config["this_server"]["address"] 
        ks_meta["server_name"] = vf_config["this_server"]["address"] 
 

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  9f1d4c65da1bd8db8ad5a46beb39c279409e08c5 \
  8f3f0798c093f2d4c1c50c8c71586c74145f8759




More information about the Et-mgmt-commits-list mailing list