7.0.0
This commit is contained in:
@@ -14,8 +14,9 @@ from ansible.module_utils.decort_utils import *
|
||||
|
||||
|
||||
class decort_osimage(DecortController):
|
||||
def __init__(self,amodule):
|
||||
super(decort_osimage, self).__init__(amodule)
|
||||
def __init__(self):
|
||||
super(decort_osimage, self).__init__(AnsibleModule(**self.amodule_init_args))
|
||||
amodule = self.amodule
|
||||
|
||||
self.validated_image_id = 0
|
||||
self.validated_virt_image_id = 0
|
||||
@@ -26,7 +27,7 @@ class decort_osimage(DecortController):
|
||||
self.validated_account_id, _ = self.account_find(amodule.params['account_name'])
|
||||
else:
|
||||
self.validated_account_id = amodule.params['account_Id']
|
||||
|
||||
|
||||
if self.validated_account_id == 0:
|
||||
# we failed either to find or access the specified account - fail the module
|
||||
self.result['failed'] = True
|
||||
@@ -72,9 +73,9 @@ class decort_osimage(DecortController):
|
||||
|
||||
def decort_image_create(self,amodule):
|
||||
# function that creates OS image
|
||||
image_facts = self.image_create(img_name=self.validated_image_name,
|
||||
url=amodule.params['url'],
|
||||
gid=amodule.params['gid'],
|
||||
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'],
|
||||
@@ -97,7 +98,7 @@ class decort_osimage(DecortController):
|
||||
self.result['msg'] = ("Image '{}' linked to virtual image '{}'").format(self.target_image_id,
|
||||
decort_osimage.decort_osimage_package_facts(image_facts)['id'],)
|
||||
return image_id, image_facts
|
||||
|
||||
|
||||
def decort_image_delete(self,amodule):
|
||||
# function that removes an image
|
||||
self.image_delete(imageId=amodule.image_id_delete)
|
||||
@@ -110,7 +111,7 @@ class decort_osimage(DecortController):
|
||||
image_id, image_facts = decort_osimage.decort_virt_image_find(self, amodule)
|
||||
self.result['facts'] = decort_osimage.decort_osimage_package_facts(image_facts, amodule.check_mode)
|
||||
return image_id, image_facts
|
||||
|
||||
|
||||
def decort_image_rename(self,amodule):
|
||||
# image renaming function
|
||||
image_facts = self.image_rename(imageId=self.validated_image_id, name=amodule.params['image_name'])
|
||||
@@ -149,7 +150,7 @@ class decort_osimage(DecortController):
|
||||
# if void facts provided - change state value to ABSENT and return
|
||||
ret_dict['state'] = "ABSENT"
|
||||
return ret_dict
|
||||
|
||||
|
||||
ret_dict['id'] = arg_osimage_facts['id']
|
||||
ret_dict['name'] = arg_osimage_facts['name']
|
||||
ret_dict['size'] = arg_osimage_facts['size']
|
||||
@@ -162,84 +163,95 @@ class decort_osimage(DecortController):
|
||||
ret_dict['accountId'] = arg_osimage_facts['accountId']
|
||||
return ret_dict
|
||||
|
||||
|
||||
def decort_osimage_parameters():
|
||||
"""Build and return a dictionary of parameters expected by decort_osimage module in a form accepted
|
||||
by AnsibleModule utility class."""
|
||||
|
||||
return dict(
|
||||
app_id=dict(type='str',
|
||||
required=False,
|
||||
fallback=(env_fallback, ['DECORT_APP_ID'])),
|
||||
app_secret=dict(type='str',
|
||||
required=False,
|
||||
fallback=(env_fallback, ['DECORT_APP_SECRET']),
|
||||
no_log=True),
|
||||
authenticator=dict(type='str',
|
||||
required=True,
|
||||
choices=['legacy', 'oauth2', 'jwt']),
|
||||
controller_url=dict(type='str', required=True),
|
||||
jwt=dict(type='str',
|
||||
required=False,
|
||||
fallback=(env_fallback, ['DECORT_JWT']),
|
||||
no_log=True),
|
||||
oauth2_url=dict(type='str',
|
||||
required=False,
|
||||
fallback=(env_fallback, ['DECORT_OAUTH2_URL'])),
|
||||
password=dict(type='str',
|
||||
required=False,
|
||||
fallback=(env_fallback, ['DECORT_PASSWORD']),
|
||||
no_log=True),
|
||||
pool=dict(type='str', required=False, default=""),
|
||||
sep_id=dict(type='int', required=False, default=0),
|
||||
account_name=dict(type='str', required=False),
|
||||
account_Id=dict(type='int', required=False),
|
||||
user=dict(type='str',
|
||||
required=False,
|
||||
fallback=(env_fallback, ['DECORT_USER'])),
|
||||
verify_ssl=dict(type='bool', required=False, default=True),
|
||||
workflow_callback=dict(type='str', required=False),
|
||||
workflow_context=dict(type='str', required=False),
|
||||
image_name=dict(type='str', required=False),
|
||||
image_id=dict(type='int', required=False,default=0),
|
||||
virt_id=dict(type='int', required=False, default=0),
|
||||
virt_name=dict(type='str', required=False),
|
||||
state=dict(type='str',
|
||||
default='present',
|
||||
choices=['absent', 'present']),
|
||||
drivers=dict(type='str', required=False, default="KVM_X86"),
|
||||
imagetype=dict(type='str', required=False, default="linux"),
|
||||
boottype=dict(type='str', required=False, default="uefi"),
|
||||
url=dict(type='str', required=False),
|
||||
gid=dict(type='int', required=False, default=0),
|
||||
sepId=dict(type='int', required=False, default=0),
|
||||
poolName=dict(type='str', required=False),
|
||||
hotresize=dict(type='bool', required=False, default=False),
|
||||
image_username=dict(type='str', required=False),
|
||||
image_password=dict(type='str', required=False),
|
||||
usernameDL=dict(type='str', required=False),
|
||||
passwordDL=dict(type='str', required=False),
|
||||
@property
|
||||
def amodule_init_args(self) -> dict:
|
||||
return self.pack_amodule_init_args(
|
||||
argument_spec=dict(
|
||||
pool=dict(
|
||||
type='str',
|
||||
default='',
|
||||
),
|
||||
sep_id=dict(
|
||||
type='int',
|
||||
default=0,
|
||||
),
|
||||
account_name=dict(
|
||||
type='str',
|
||||
),
|
||||
account_Id=dict(
|
||||
type='int',
|
||||
),
|
||||
image_name=dict(
|
||||
type='str',
|
||||
),
|
||||
image_id=dict(
|
||||
type='int',
|
||||
default=0,
|
||||
),
|
||||
virt_id=dict(
|
||||
type='int',
|
||||
default=0,
|
||||
),
|
||||
virt_name=dict(
|
||||
type='str',
|
||||
),
|
||||
state=dict(
|
||||
type='str',
|
||||
default='present',
|
||||
choices=[
|
||||
'absent',
|
||||
'present',
|
||||
],
|
||||
),
|
||||
drivers=dict(
|
||||
type='str',
|
||||
default='KVM_X86',
|
||||
),
|
||||
imagetype=dict(
|
||||
type='str',
|
||||
default='linux',
|
||||
),
|
||||
boottype=dict(
|
||||
type='str',
|
||||
default='uefi',
|
||||
),
|
||||
url=dict(
|
||||
type='str',
|
||||
),
|
||||
gid=dict(
|
||||
type='int',
|
||||
default=0,
|
||||
),
|
||||
sepId=dict(
|
||||
type='int',
|
||||
default=0,
|
||||
),
|
||||
poolName=dict(
|
||||
type='str',
|
||||
),
|
||||
hotresize=dict(
|
||||
type='bool',
|
||||
default=False,
|
||||
),
|
||||
image_username=dict(
|
||||
type='str',
|
||||
),
|
||||
image_password=dict(
|
||||
type='str',
|
||||
),
|
||||
usernameDL=dict(
|
||||
type='str',
|
||||
),
|
||||
passwordDL=dict(
|
||||
type='str',
|
||||
),
|
||||
),
|
||||
supports_check_mode=True,
|
||||
)
|
||||
|
||||
|
||||
def main():
|
||||
module_parameters = decort_osimage.decort_osimage_parameters()
|
||||
|
||||
amodule = AnsibleModule(argument_spec=module_parameters,
|
||||
supports_check_mode=True,
|
||||
mutually_exclusive=[
|
||||
['oauth2', 'password'],
|
||||
['password', 'jwt'],
|
||||
['jwt', 'oauth2'],
|
||||
],
|
||||
required_together=[
|
||||
['app_id', 'app_secret'],
|
||||
['user', 'password'],
|
||||
],
|
||||
)
|
||||
|
||||
decon = decort_osimage(amodule)
|
||||
|
||||
decon = decort_osimage()
|
||||
amodule = decon.amodule
|
||||
if amodule.params['virt_name'] or amodule.params['virt_id']:
|
||||
|
||||
image_id, image_facts = decort_osimage.decort_virt_image_find(decon, amodule)
|
||||
|
||||
Reference in New Issue
Block a user