neillc/tripleo-aio-helpers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bootcmd parsing

Browse source
This commit is contained in:
Neill Cox 2023-09-26 10:30:35 +10:00
parent e5359326ee
commit ac86e51c2d
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tripleo_aio_helpers/create_aio_vm.py
View file

@ -69,6 +69,7 @@ def parse_args():
args.public_key = args.public_key.read() args.public_key = args.public_key.read()
args.user_data = args.user_data.read() args.user_data = args.user_data.read()
generate_boot_cmd(args)
args.user_data = args.user_data.format(data=args) args.user_data = args.user_data.format(data=args)
args.meta_data = args.meta_data.read() args.meta_data = args.meta_data.read()
@ -89,10 +90,7 @@ def parse_args():
return args return args
def generate_boot_cmd(data):
def write_user_data(data):
"""Write out a temporary user data file"""
data.bootcmd="" data.bootcmd=""
if data.cidr_1: if data.cidr_1:
data.bootcmd = ( data.bootcmd = (
@ -102,7 +100,10 @@ def write_user_data(data):
' - "nmcli networking off"\n' ' - "nmcli networking off"\n'
' - "nmcli networking on"\n' ' - "nmcli networking on"\n'
) )
def write_user_data(data):
"""Write out a temporary user data file"""
with open(UD_PATH, "w", encoding="utf-8") as user_data_file: with open(UD_PATH, "w", encoding="utf-8") as user_data_file:
user_data_file.write(data) user_data_file.write(data)