release 0.2.8

6 files changed, 14 insertions, 44 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 791c6941..af459b80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 Koan CHANGELOG
 
+* Fri Mar 23 2007 Michael DeHaan <mdehaan@redhat.com> - 0.2.8-1
+- Remove redundant code for --virt-name handling.
+
 * Wed Mar 14 2007 Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1
 - Use virtinst for installing Xen
 
diff --git a/koan.pod b/koan.pod
index 4b75026a..1870c573 100644
--- a/koan.pod
+++ b/koan.pod
@@ -1,9 +1,6 @@
 =head1 NAME
 
-koan stands for "kickstart-over-a-network" and allows for both
-network provisioning of new virtualized guests and destructive provisioning of
-any existing system.  For use with a boot-server configured with
-'cobbler'.
+koan stands for "kickstart-over-a-network" and allows for both network provisioning of new virtualized guests and destructive provisioning of any existing system.  For use with a boot-server configured with 'cobbler'.
 
 =head1 SYNOPSIS
 
diff --git a/koan.spec b/koan.spec
index 8f246944..6ac0d23a 100644
--- a/koan.spec
+++ b/koan.spec
@@ -2,7 +2,7 @@
 
 Summary: Network provisioning tool for Xen and Bare Metal Machines 
 Name: koan
-Version: 0.2.7
+Version: 0.2.8
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -49,6 +49,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Fri Mar 23 2007 - Michael DeHaan <mdehaan@redhat.com> - 0.2.8-1
+- Upstream changes (see CHANGELOG)
+
 * Wed Mar 08 2007 - Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1
 - Upstream changes (see CHANGELOG)
 
@@ -87,7 +90,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 - Excluding PPC since syslinux (gethostip) isn't available for ppc
 
 * Thu Sep 21 2006 - Michael DeHaan <mdehaan@redhat.com> - 0.1.1-8
-- Added doc files to %doc, removed INSTALLED_FILES code
+- Added doc files to %%doc, removed INSTALLED_FILES code
 
 * Wed Sep 20 2006 - Michael DeHaan <mdehaan@redhat.com> - 0.1.1-7
 - Upstream updates
diff --git a/koan/app.py b/koan/app.py
index f6e80d75..8f795aa6 100755
--- a/koan/app.py
+++ b/koan/app.py
@@ -4,7 +4,7 @@ koan = kickstart over a network
 a tool for network provisioning of virtualization and network re-provisioning
 of existing Linux systems.  used with 'cobbler'. see manpage for usage.
 
-Copyright 2006 Red Hat, Inc.
+Copyright 2006-2007 Red Hat, Inc.
 Michael DeHaan <mdehaan@redhat.com>
 
 This software may be freely redistributed under the terms of the GNU
@@ -27,6 +27,7 @@ import time
 import shutil
 import errno
 import re
+import sys
 
 """
 koan --virt [--profile=webserver|--system=name] --server=hostname
@@ -587,9 +588,9 @@ class Koan:
             import virtcreate
         except:
             print "no virtualization support available, install python-virtinst?"
+            sys.exit(1)
 
         results = virtcreate.start_paravirt_install(
-            name=self.calc_virt_name(pd),
             ram=self.calc_virt_ram(pd),
             disk= self.calc_virt_filesize(pd),
             mac=virtcreate.get_mac(self.calc_virt_mac(pd)),
@@ -601,45 +602,11 @@ class Koan:
         )
         print results
 
-    def calc_virt_name(self,data):
-        """
-        Turn the suggested name into a non-conflicting name.
-        Currently this is Xen specific, may change later.
-        """
-        # FIXME: number incrementing needs to mod with vircreate bits
-        name = self.safe_load(data,'virt_name','xen_name')
-        if name is None or name == "":
-            name = self.profile
-        path = "/etc/xen/%s" % name
-        file_id = 0
-        if os.path.exists(path):
-            for fid in xrange(1,9999):
-                path = "/etc/xen/%s_%s" % (name, fid)
-                if not os.path.exists(path):
-                    file_id = fid
-                    break
-        if file_id != 0:
-            name = "%s_%s" % (name,file_id)
-        data['virt_name'] = name
-        return name
-
     def calc_virt_uuid(self,data):
         # TODO: eventually we may want to allow some koan CLI
         # option for passing in the UUID.  Until then, it's random.
         return None
 
-    def calc_virt_filename(self,data):
-        """
-        Determine where to store the virtualization file.
-        """
-        if not os.path.exists("/var/lib/xen/images"):
-             try:
-                 os.makedirs("/var/lib/xen/images")
-             except:
-                 pass
-        vname = self.safe_load(data,'virt_name','xen_name')
-        return os.path.join("/var/lib/xen/images","%s.disk" % vname)
-
     def calc_virt_filesize(self,data):
         """
         Assign a virt filesize if none is given in the profile.
diff --git a/koan/virtcreate.py b/koan/virtcreate.py
index b1ddeff0..e028721f 100755
--- a/koan/virtcreate.py
+++ b/koan/virtcreate.py
@@ -73,7 +73,7 @@ def get_mac(mac):
     return randomMAC()
 
 
-def start_paravirt_install(name=None, ram=None, disk=None, mac=None,
+def start_paravirt_install(ram=None, disk=None, mac=None,
                            uuid=None, kernel=None, initrd=None, extra=None):
 
 
diff --git a/setup.py b/setup.py
index 8f6cc0d3..61e9f32a 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 from distutils.core import setup, Extension
 import string
 
-VERSION = "0.2.7"
+VERSION = "0.2.8"
 SHORT_DESC = "Network provisioning tool for Virtualized Images and Existing Non-Bare Metal"
 LONG_DESC = """
 koan stands for "kickstart-over-a-network" and allows for both