Bug 853980

Description of problem:
running the command:
sudo koan --virt --virt-name=xxx  --server=puppet   --system=xxx
on a system with qemu based virtualisation does not inject the kickstart file into the boot process.  

The output from:
print results
in virt_net_install in app.py, after calling create_func, looks like this:
- ['virt-install', '--connect', 'qemu:///system', '--name', 'robot', '--ram', '1024', '--vcpus', '1', '--autostart', '--vnc', '--hvm', '--location', 'http://172.17.31.77/cblr/links/f17-i386/', '--arch', 'i386', '--os-variant', 'generic26', '--disk', 'path=/var/lib/libvirt/images//robot-disk0,size=5', '--network', 'bridge=vmbridge', '--mac=00:16:3e:4d:79:04', '--wait', '0', '--noautoconsole']

I think that the --hvm should also have the kickstart description appended to it. Lines 200-219 of /usr/lib/python2.7/site-packages/koan/virtinstall.py indicate that the --extra-args are not appended properly. If I delete the else: on 204 then the boot works ok, giving this output, and going on to act on the kickstart file:

- ['virt-install', '--connect', 'qemu:///system', '--name', 'robot', '--ram', '1024', '--vcpus', '1', '--autostart', '--vnc', '--hvm', '--extra-args=ks=http://172.17.31.77/cblr/svc/op/ks/system/robot ksdevice=link kssendmac lang= text ', '--location', 'http://172.17.31.77/cblr/links/f17-i386/', '--arch', 'i386', '--os-variant', 'generic26', '--disk', 'path=/var/lib/libvirt/images//robot-disk0,size=5', '--network', 'bridge=vmbridge', '--mac=00:16:3e:4d:79:04', '--wait', '0', '--noautoconsole']

Here's the relevant code snippet:
   198      if is_qemu and virt_type:
   199          if not disable_virt_type:
   200              cmd += "--virt-type %s " % virt_type
       
   201      if fullvirt or is_qemu or is_import:
   202          if fullvirt is not None:
   203              cmd += "--hvm "
   204          else:
   205              cmd += ("--extra-args=\"%s\" " % (extra))
   206          if is_xen:
   207              cmd += "--pxe "
       
   208          elif cdrom:
   209              cmd += "--cdrom %s " % cdrom
   210          elif location:
   211              cmd += "--location %s " % location
   212          elif importpath:
   213              cmd += "--import "
       
   214          if arch:
   215              cmd += "--arch %s " % arch
   216      else:
   217          cmd += "--paravirt "
   218          cmd += ("--boot kernel=%s,initrd=%s,kernel_args=\"%s\" " %
   219                  (kernel, initrd, extra))

As I don't have anything more than my one installation, I've no idea whether just removing the else: appropriate or sufficient.

Version-Release number of selected component (if applicable):
Fedora 17
koan-2.2.3-2.fc17.noarch
qemu-1.0.1-1.fc17.i686

How reproducible:
Unclear - I'm not sure what are the key components involved in this scenario. However, assuming that it's just qemu and koan, it seems to be consistent.

Steps to Reproduce:
1. import an f17 profile
2. define a system based on the profile with a kickstart file
3. run the above koan command
  
Actual results:
kickstart not used by anaconda on the vm. Built command does not include --extra-args parameter


Expected results:
vm should launch and install using the kickstart.


Additional info: