Fix kernel boot params

Change-Id: Iae2cab1280d40336cb3f91edf04cdb2472fdbd36
Closes-bug: #1456235
This commit is contained in:
Dmitry Tyzhnenko
2015-05-18 18:12:59 +03:00
parent 547eda1def
commit 4e179fd25e
2 changed files with 7 additions and 3 deletions

View File

@@ -182,7 +182,8 @@ def get_slave_ip(env, node_mac_address):
return ip[0].rstrip()
def get_keys(ip, mask, gw, hostname, nat_interface, dns1, showmenu):
def get_keys(ip, mask, gw, hostname, nat_interface, dns1, showmenu,
build_images):
params = {
'ip': ip,
'mask': mask,
@@ -191,10 +192,11 @@ def get_keys(ip, mask, gw, hostname, nat_interface, dns1, showmenu):
'nat_interface': nat_interface,
'dns1': dns1,
'showmenu': showmenu,
'build_images': build_images
}
keys = (
"<Wait>\n"
"<Esc><Enter>\n"
"<Esc>\n"
"<Wait>\n"
"vmlinuz initrd=initrd.img ks=cdrom:/ks.cfg\n"
" ip=%(ip)s\n"
@@ -204,6 +206,7 @@ def get_keys(ip, mask, gw, hostname, nat_interface, dns1, showmenu):
" hostname=%(hostname)s\n"
" dhcp_interface=%(nat_interface)s\n"
" showmenu=%(showmenu)s\n"
" build_images=%(build_images)s\n"
" <Enter>\n"
) % params
return keys

View File

@@ -89,7 +89,8 @@ def admin_change_config(admin_node,
hostname=hostname,
nat_interface='',
dns1=dns1,
showmenu='no')
showmenu='no',
build_images=0)
print("Waiting for admin node to start up")
wait(lambda: admin_node.driver.node_active(admin_node), 60)