stackforge
/
novaimagebuilder
Code Issues Proposed changes

merge error

This commit is contained in:
Ian McLeod 2013-04-01 14:42:53 -05:00
parent 4391d3ee60
commit 200d6d84d3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
create_glance_image.py
View File

@ -468,7 +468,7 @@ def wait_for_noping(instance, nova, console_password, console_command):
def launch_and_wait(image_id, ks_file, creds, vnc_password):
def launch_and_wait(image_id, ks_file, image_name, creds, console_password, console_command):
nova = nova_client.Client(creds['username'], creds['password'], creds['tenant'],
auth_url=creds['auth_url'], insecure=True)
instance = nova.servers.create(instance_name, image_id, 2, userdata=working_ks, meta={})