Dnf #1

Merged
neillc merged 20 commits from dnf into master 2023-09-28 10:34:16 +10:00
Showing only changes of commit 47b559fbd0 - Show all commits

View file

@ -15,15 +15,14 @@ ND_PATH = "./network-config"
def parse_args(): def parse_args():
"""Parse the command line arguments""" """Parse the command line arguments"""
template_path = pathlib.Path(__file__).parent.parent / "virt-install" template_path = pathlib.Path(__file__).parent.parent / "virt-install"
import pdb;pdb.set_trace()
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--password", required=True) parser.add_argument("--password", required=True)
parser.add_argument("--public-key", required=True, type=open) parser.add_argument("--public-key", required=True, type=open)
parser.add_argument("--local-hostname", required=True) parser.add_argument("--local-hostname", required=True)
parser.add_argument("--user-data", default=template_path / "user-data.tpl", type=open) parser.add_argument("--user-data", default=template_path / "user-data.tpl")
parser.add_argument("--meta-data", default=template_path / "/meta-data.tpl", type=open) parser.add_argument("--meta-data", default=template_path / "/meta-data.tpl")
parser.add_argument( parser.add_argument(
"--network-data", default=template_path / "network-config.tpl", type=open "--network-data", default=template_path / "network-config.tpl"
) )
parser.add_argument("--instance-id", required=True, help="Hostname for the new VM") parser.add_argument("--instance-id", required=True, help="Hostname for the new VM")
parser.add_argument("--output-image", required=True) parser.add_argument("--output-image", required=True)
@ -68,14 +67,17 @@ def parse_args():
args.public_key = args.public_key.read() args.public_key = args.public_key.read()
args.user_data = args.user_data.read() with open(args.user_data) as user_data:
args.user_data = user_data.read()
generate_boot_cmd(args) 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() with open(args.meta_data) as meta_data:
args.meta_data = meta_data.read()
args.meta_data = args.meta_data.format(data=args) args.meta_data = args.meta_data.format(data=args)
args.network_data = args.network_data.read() with open(args.network_data) as network_data:
args.network_data = network_data.read()
args.network_data = args.network_data.format(data=args) args.network_data = args.network_data.format(data=args)
output_image = pathlib.Path(args.output_image) output_image = pathlib.Path(args.output_image)