0.2.7 release

4 files changed, 15 insertions, 13 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 273fe858..791c6941 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 Koan CHANGELOG
 
-* Thu Mar 08 2007 Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1
+* Wed Mar 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1
 - Use virtinst for installing Xen
 
 * Thu Jan 24 2007 Michael DeHaan <mdehaan@redhat.com> - 0.2.6-1
diff --git a/koan.pod b/koan.pod
index 88c48c50..4b75026a 100644
--- a/koan.pod
+++ b/koan.pod
@@ -11,7 +11,9 @@ koan --server=<host> --list-profiles
 
 koan --server=<host> --list-systems
 
-koan --virt --server=<host> --profile=<name> [--interactive]
+koan --virt --server=<host> --profile=<name>
+
+koan --virt --server=<host> --system=<name>
 
 koan --replace-self --server=<host> --profile=<name>
 
@@ -21,15 +23,15 @@ koan --replace-self --server=<host> --system=<name>
 
 When invoked, koan requests profile information from a remote boot server that has been configured with cobbler.   What koan does with the profile data depends on whether it was invoked with --virt or --replace-self.
 
-For --virt, cobbler will create new virtualized guests on a machine in accordance to the orders from cobbler.  If you add the --interactive flag, you can watch the kickstart as it happens in an "xm console".   This is helpful for debugging and is highly recommended until you're sure your kickstarts are fully automated.  To exit, use the usual Ctrl + right bracket you use to exit an xm console.
+For --virt, cobbler will create new virtualized guests on a machine in accordance to the orders from cobbler.  You can then, once finished, use "virsh" and "xm" commands on the guest.  Cobbler automatically names domains based on their mac addresses.   
 
-For re-kickstarting ('--replace-self'), this means reprovisioning the system, blowing away any current data and replacing it with the results of a network install.
+For re-kickstarting ('--replace-self'), cobbler will reprovisioning the system, blowing away any current data and replacing it with the results of a network install.
 
 =head1 NOTES FOR USERS OF COBBLER TEMPLATING
 
 Cobbler contains an advanced templating feature that allows a single kickstart file to be customized on a per-system basis.  See the cobbler manpage for more details.
 
-Ordinarily specifying the cobbler profile (--profile) when running koan would be sufficient, though if you are utilizing cobbler's templating features, you might want to provision the system by specifying a cobbler system entry instead.  The arguments to --system would be an ip, such as --system=172.16.57.21 or a MAC, such as --system=00:11:22:AA:BB:CC.  If the cobbler administrator has created any customizations for the system, this way, the koan machine will be sure to get them.  Note, however, that if the cobbler administrator never created an entry for the IP and/or MAC address, this will fail, and you should resort to using the profile name.
+If you have system specific customizations in your kickstarts and have cobbler system definitions defined server side for those systems, use --system and not --profile.
 
 =head1 ADDITIONAL
 
diff --git a/koan.spec b/koan.spec
index daf3e5e3..8f246944 100644
--- a/koan.spec
+++ b/koan.spec
@@ -49,7 +49,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Thu Mar 06 2007 - Michael DeHaan <mdehaan@redhat.com> - 0.2.6-2
+* Wed Mar 08 2007 - Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1
 - Upstream changes (see CHANGELOG)
 
 * Wed Feb 28 2007 - Michael DeHaan <mdehaan@redhat.com> - 0.2.6-2
diff --git a/koan/virtcreate.py b/koan/virtcreate.py
index 0cb9d126..b1ddeff0 100755
--- a/koan/virtcreate.py
+++ b/koan/virtcreate.py
@@ -1,10 +1,10 @@
-#
 # Virtualization installation functions.  
-# Code originated from xenguest-install.
-# Currently somewhat Xen specific, but it goes through libvirt,
-# so this may change later.
+# Currently somewhat Xen/paravirt specific, will evolve later.
+#
+# Copyright 2006-2007 Red Hat, Inc.
+# Michael DeHaan <mdehaan@redhat.com>
 #
-# Copyright 2005-2006  Red Hat, Inc.
+# Original version based on virtguest-install
 # Jeremy Katz <katzj@redhat.com>
 # Option handling added by Andrew Puch <apuch@redhat.com>
 # Simplified for use as library by koan, Michael DeHaan <mdehaan@redhat.com>
@@ -23,7 +23,7 @@ from optparse import OptionParser
 import exceptions
 import errno
 import re
-import virtinst   # NEW!
+import virtinst
 
 class VirtCreateException(exceptions.Exception):
     pass
@@ -79,7 +79,7 @@ def start_paravirt_install(name=None, ram=None, disk=None, mac=None,
 
     if mac == None:
        mac = randomMAC()
-    macname = mac.replace(":","_")
+    macname = mac.replace(":","_").upper()
 
     guest = virtinst.ParaVirtGuest()
     guest.set_boot((kernel,initrd))