8.0.0
This commit is contained in:
@@ -72,13 +72,61 @@ class decort_osimage(DecortController):
|
||||
|
||||
|
||||
def decort_image_create(self,amodule):
|
||||
aparam_boot = self.aparams['boot']
|
||||
boot_mode = 'bios'
|
||||
loader_type = 'unknown'
|
||||
if aparam_boot is not None:
|
||||
if aparam_boot['mode'] is None:
|
||||
self.message(
|
||||
msg=self.MESSAGES.default_value_used(
|
||||
param_name='boot.mode',
|
||||
default_value=boot_mode
|
||||
),
|
||||
warning=True,
|
||||
)
|
||||
else:
|
||||
boot_mode = aparam_boot['mode']
|
||||
|
||||
if aparam_boot['loader_type'] is None:
|
||||
self.message(
|
||||
msg=self.MESSAGES.default_value_used(
|
||||
param_name='boot.loader_type',
|
||||
default_value=loader_type
|
||||
),
|
||||
warning=True,
|
||||
)
|
||||
else:
|
||||
loader_type = aparam_boot['loader_type']
|
||||
|
||||
network_interface_naming = self.aparams['network_interface_naming']
|
||||
if network_interface_naming is None:
|
||||
network_interface_naming = 'ens'
|
||||
self.message(
|
||||
msg=self.MESSAGES.default_value_used(
|
||||
param_name='network_interface_naming',
|
||||
default_value=network_interface_naming
|
||||
),
|
||||
warning=True,
|
||||
)
|
||||
|
||||
hot_resize = self.aparams['hot_resize']
|
||||
if hot_resize is None:
|
||||
hot_resize = False
|
||||
self.message(
|
||||
msg=self.MESSAGES.default_value_used(
|
||||
param_name='hot_resize',
|
||||
default_value=hot_resize
|
||||
),
|
||||
warning=True,
|
||||
)
|
||||
|
||||
# function that creates OS image
|
||||
image_facts = self.image_create(img_name=self.validated_image_name,
|
||||
url=amodule.params['url'],
|
||||
gid=amodule.params['gid'],
|
||||
boottype=amodule.params['boottype'],
|
||||
imagetype=amodule.params['imagetype'],
|
||||
hotresize=amodule.params['hotresize'],
|
||||
boot_mode=boot_mode,
|
||||
boot_loader_type=loader_type,
|
||||
hot_resize=hot_resize,
|
||||
username=amodule.params['image_username'],
|
||||
password=amodule.params['image_password'],
|
||||
account_Id=self.validated_account_id,
|
||||
@@ -86,7 +134,8 @@ class decort_osimage(DecortController):
|
||||
passwordDL=amodule.params['passwordDL'],
|
||||
sepId=amodule.params['sepId'],
|
||||
poolName=amodule.params['poolName'],
|
||||
drivers=amodule.params['drivers'])
|
||||
drivers=amodule.params['drivers'],
|
||||
network_interface_naming=network_interface_naming)
|
||||
self.result['changed'] = True
|
||||
return image_facts
|
||||
|
||||
@@ -126,7 +175,11 @@ class decort_osimage(DecortController):
|
||||
image_id, image_facts = self.decort_virt_image_find(amodule)
|
||||
return image_id, image_facts
|
||||
|
||||
def decort_osimage_package_facts(arg_osimage_facts, arg_check_mode=False):
|
||||
@staticmethod
|
||||
def decort_osimage_package_facts(
|
||||
arg_osimage_facts: dict | None,
|
||||
arg_check_mode=False,
|
||||
):
|
||||
"""Package a dictionary of OS image according to the decort_osimage module specification. This
|
||||
dictionary will be returned to the upstream Ansible engine at the completion of the module run.
|
||||
|
||||
@@ -154,13 +207,26 @@ class decort_osimage(DecortController):
|
||||
ret_dict['id'] = arg_osimage_facts['id']
|
||||
ret_dict['name'] = arg_osimage_facts['name']
|
||||
ret_dict['size'] = arg_osimage_facts['size']
|
||||
ret_dict['type'] = arg_osimage_facts['type']
|
||||
# ret_dict['arch'] = arg_osimage_facts['architecture']
|
||||
ret_dict['sep_id'] = arg_osimage_facts['sepId']
|
||||
ret_dict['pool'] = arg_osimage_facts['pool']
|
||||
ret_dict['state'] = arg_osimage_facts['status']
|
||||
ret_dict['linkto'] = arg_osimage_facts['linkTo']
|
||||
ret_dict['accountId'] = arg_osimage_facts['accountId']
|
||||
ret_dict['boot_mode'] = arg_osimage_facts['bootType']
|
||||
|
||||
ret_dict['boot_loader_type'] = ''
|
||||
match arg_osimage_facts['type']:
|
||||
case 'cdrom' | 'virtual' as type:
|
||||
ret_dict['type'] = type
|
||||
case _ as boot_loader_type:
|
||||
ret_dict['type'] = 'template'
|
||||
ret_dict['boot_loader_type'] = boot_loader_type
|
||||
|
||||
ret_dict['network_interface_naming'] = arg_osimage_facts[
|
||||
'networkInterfaceNaming'
|
||||
]
|
||||
ret_dict['hot_resize'] = arg_osimage_facts['hotResize']
|
||||
return ret_dict
|
||||
|
||||
@property
|
||||
@@ -207,14 +273,6 @@ class decort_osimage(DecortController):
|
||||
type='str',
|
||||
default='KVM_X86',
|
||||
),
|
||||
imagetype=dict(
|
||||
type='str',
|
||||
default='linux',
|
||||
),
|
||||
boottype=dict(
|
||||
type='str',
|
||||
default='uefi',
|
||||
),
|
||||
url=dict(
|
||||
type='str',
|
||||
),
|
||||
@@ -229,9 +287,8 @@ class decort_osimage(DecortController):
|
||||
poolName=dict(
|
||||
type='str',
|
||||
),
|
||||
hotresize=dict(
|
||||
hot_resize=dict(
|
||||
type='bool',
|
||||
default=False,
|
||||
),
|
||||
image_username=dict(
|
||||
type='str',
|
||||
@@ -245,6 +302,33 @@ class decort_osimage(DecortController):
|
||||
passwordDL=dict(
|
||||
type='str',
|
||||
),
|
||||
boot=dict(
|
||||
type='dict',
|
||||
options=dict(
|
||||
mode=dict(
|
||||
type='str',
|
||||
choices=[
|
||||
'bios',
|
||||
'uefi',
|
||||
],
|
||||
),
|
||||
loader_type=dict(
|
||||
type='str',
|
||||
choices=[
|
||||
'windows',
|
||||
'linux',
|
||||
'unknown',
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
network_interface_naming=dict(
|
||||
type='str',
|
||||
choices=[
|
||||
'ens',
|
||||
'eth',
|
||||
],
|
||||
),
|
||||
),
|
||||
supports_check_mode=True,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user