Commit 13ed0f14 authored by Kristopher Ruzic's avatar Kristopher Ruzic

removes extra data in json, and adds missing portions :)

parent d7bb8747
...@@ -21,10 +21,7 @@ kvm_argument_list = [] ...@@ -21,10 +21,7 @@ kvm_argument_list = []
# XXX: give all of this through parameter, don't use this as template, but as module # XXX: give all of this through parameter, don't use this as template, but as module
# use_tap and use_nat set as Bool as per http://stackoverflow.com/a/922374 # use_tap and use_nat set as Bool as per http://stackoverflow.com/a/922374
build["disk_size"] = '%(disk-size)s' build["disk_size"] = '%(disk-size)s'
build["disk_type"] = '%(disk-type)s' build["type"] = 'qemu'
build["hostname"] = '%(packer-hostname)s'
build["domain"] = '%(packer-domain)s'
instance_dir = '%(instance-dir)s' instance_dir = '%(instance-dir)s'
socket_path = '%(socket-path)s' socket_path = '%(socket-path)s'
nbd_list = (('%(nbd-host)s', %(nbd-port)s), ('%(nbd2-host)s', %(nbd2-port)s)) nbd_list = (('%(nbd-host)s', %(nbd-port)s), ('%(nbd2-host)s', %(nbd2-port)s))
...@@ -142,7 +139,7 @@ if smp_options: ...@@ -142,7 +139,7 @@ if smp_options:
kvm_argument_list += [ kvm_argument_list += [
['-enable-kvm'], ['-smp', smp], ['-m', ram_size], ['-enable-kvm'], ['-smp', smp], ['-m', ram_size],
['-drive', 'file=%%s,if=%%s' %% (disk_path, build["disk_type"])], ['-drive', 'file=%%s,if=%%s' %% (disk_path, '%(disk-type)s')],
['-vnc', '%%s:1,ipv4,password' %% listen_ip], ['-vnc', '%%s:1,ipv4,password' %% listen_ip],
['-boot', 'order=cd,menu=on'], ['-boot', 'order=cd,menu=on'],
['-qmp', 'unix:%%s,server' %% socket_path], ['-qmp', 'unix:%%s,server' %% socket_path],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment