gryf/boxpy
1
0
Fork 0
mirror of https://github.com/gryf/boxpy.git synced 2025-12-19 05:30:18 +01:00
Code Issues Projects Releases Wiki Activity

Cacluate hostname out of vm name.

Browse Source
This commit is contained in:
gryf
2021-04-20 11:56:46 +02:00
parent d4afa6e90b
commit 9da0e3f6ff
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
box.py
View File

@@ -550,8 +550,16 @@ def vmcreate(args):
vbox.create_controller('IDE', 'ide') vbox.create_controller('IDE', 'ide')
vbox.create_controller('SATA', 'sata') vbox.create_controller('SATA', 'sata')
def normalize_name(name):
name = name.replace(' ', '-')
name = name.encode('ascii', errors='ignore')
name = name.decode('utf-8')
return ''.join(x for x in name if x.isalnum() or x == '-')
hostname = args.hostname or normalize_name(args.name)
vbox.setextradata('key', args.key) vbox.setextradata('key', args.key)
vbox.setextradata('hostname', args.hostname) vbox.setextradata('hostname', hostname)
vbox.setextradata('version', args.version) vbox.setextradata('version', args.version)
if args.user_data_path: if args.user_data_path:
vbox.setextradata('user_data_path', args.user_data_path) vbox.setextradata('user_data_path', args.user_data_path)
@@ -559,7 +567,7 @@ def vmcreate(args):
image = Image(vbox, args.version) image = Image(vbox, args.version)
path_to_disk = image.convert_to_vdi(args.name + '.vdi', args.disk_size) path_to_disk = image.convert_to_vdi(args.name + '.vdi', args.disk_size)
iso = IsoImage(args.hostname, args.key, args.user_data_path) iso = IsoImage(hostname, args.key, args.user_data_path)
path_to_iso = iso.get_generated_image() path_to_iso = iso.get_generated_image()
vbox.storageattach('SATA', 0, 'hdd', path_to_disk) vbox.storageattach('SATA', 0, 'hdd', path_to_disk)
vbox.storageattach('IDE', 1, 'dvddrive', path_to_iso) vbox.storageattach('IDE', 1, 'dvddrive', path_to_iso)
@@ -655,8 +663,8 @@ def main():
"~/.ssh/id_rsa") "~/.ssh/id_rsa")
create.add_argument('-m', '--memory', default='2048', create.add_argument('-m', '--memory', default='2048',
help="amount of memory in Megabytes, default 2GB") help="amount of memory in Megabytes, default 2GB")
create.add_argument('-n', '--hostname', default="ubuntu", create.add_argument('-n', '--hostname',
help="VM hostname. Default ubuntu") help="VM hostname. Default same as vm name")
create.add_argument('-p', '--port', default='2222', create.add_argument('-p', '--port', default='2222',
help="set ssh port for VM, default 2222") help="set ssh port for VM, default 2222")
create.add_argument('-u', '--user-data-path', create.add_argument('-u', '--user-data-path',