From e763146f0ca1f81dfe0958bda0c65f0036879930 Mon Sep 17 00:00:00 2001 From: Ondra Machacek Date: Wed, 22 Nov 2017 19:47:51 +0100 Subject: [PATCH] cloud: ovirt: Don't require all iscsi params to be passed to host (#33133) --- .../modules/cloud/ovirt/ovirt_hosts.py | 20 ++++++++++--------- .../cloud/ovirt/ovirt_storage_domains.py | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py b/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py index 0c3680e1c4..44ec8ee2ec 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py @@ -499,12 +499,13 @@ def main(): ) elif state == 'iscsidiscover': host_id = get_id_by_name(hosts_service, module.params['name']) + iscsi_param = module.params['iscsi'] iscsi_targets = hosts_service.service(host_id).iscsi_discover( iscsi=otypes.IscsiDetails( - port=int(module.params['iscsi']['port']) if module.params['iscsi']['port'].isdigit() else None, - username=module.params['iscsi']['username'], - password=module.params['iscsi']['password'], - address=module.params['iscsi']['address'], + port=int(iscsi_param.get('port', 3260)), + username=iscsi_param.get('username'), + password=iscsi_param.get('password'), + address=iscsi_param.get('address'), ), ) ret = { @@ -514,14 +515,15 @@ def main(): } elif state == 'iscsilogin': host_id = get_id_by_name(hosts_service, module.params['name']) + iscsi_param = module.params['iscsi'] ret = hosts_module.action( action='iscsi_login', iscsi=otypes.IscsiDetails( - port=int(module.params['iscsi']['port']) if module.params['iscsi']['port'].isdigit() else None, - username=module.params['iscsi']['username'], - password=module.params['iscsi']['password'], - address=module.params['iscsi']['address'], - target=module.params['iscsi']['target'], + port=int(iscsi_param.get('port', 3260)), + username=iscsi_param.get('username'), + password=iscsi_param.get('password'), + address=iscsi_param.get('address'), + target=iscsi_param.get('target'), ), ) elif state == 'started': diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py index 2131b33957..e0008eb3f4 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_storage_domains.py @@ -304,7 +304,7 @@ class StorageDomainModule(BaseModule): otypes.LogicalUnit( id=lun_id, address=storage.get('address'), - port=storage.get('port', 3260), + port=int(storage.get('port', 3260)), target=storage.get('target'), username=storage.get('username'), password=storage.get('password'),