summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Nečas <necas.marty@gmail.com>2020-03-03 02:18:12 +0100
committerGitHub <noreply@github.com>2020-03-02 17:18:12 -0800
commit9351cbfde3236d2f7411fe5bd75b6b6c2bcb9630 (patch)
treebe57a4c6cc898e5b8ac2ca08fad0a418cdab4bb0
parent151d83efc3e32339d3397d9ec8e05e34b93e1a62 (diff)
downloadansible-9351cbfde3236d2f7411fe5bd75b6b6c2bcb9630.tar.gz
Fixi iscsi register backport (#67542)
* Fix KeyError for iSCSI parameters (#67463) The required parameters for the LUN mapping for destination LUN is address, port and iqn. However if the user doesn't pass parameters like CHAP authentication parameters, we will get KeyError. The patch fixes the same. * add changelog Co-authored-by: Nijin Ashok <nashok@redhat.com>
-rw-r--r--changelogs/fragments/67463-ovirt_vm-fix-keyError-for-iSCSI-parameters.yml2
-rw-r--r--lib/ansible/modules/cloud/ovirt/ovirt_vm.py14
2 files changed, 9 insertions, 7 deletions
diff --git a/changelogs/fragments/67463-ovirt_vm-fix-keyError-for-iSCSI-parameters.yml b/changelogs/fragments/67463-ovirt_vm-fix-keyError-for-iSCSI-parameters.yml
new file mode 100644
index 0000000000..7e47b7b9c9
--- /dev/null
+++ b/changelogs/fragments/67463-ovirt_vm-fix-keyError-for-iSCSI-parameters.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - "ovirt_vm: correct keyError for iSCSI parameters" \ No newline at end of file
diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py
index 6e1616395d..2560f5bb21 100644
--- a/lib/ansible/modules/cloud/ovirt/ovirt_vm.py
+++ b/lib/ansible/modules/cloud/ovirt/ovirt_vm.py
@@ -2166,13 +2166,13 @@ def _get_lun_mappings(module):
['iscsi', 'fcp']) else None,
logical_units=[
otypes.LogicalUnit(
- id=lunMapping['dest_logical_unit_id'],
- port=lunMapping['dest_logical_unit_port'],
- portal=lunMapping['dest_logical_unit_portal'],
- address=lunMapping['dest_logical_unit_address'],
- target=lunMapping['dest_logical_unit_target'],
- password=lunMapping['dest_logical_unit_password'],
- username=lunMapping['dest_logical_unit_username'],
+ id=lunMapping.get('dest_logical_unit_id'),
+ port=lunMapping.get('dest_logical_unit_port'),
+ portal=lunMapping.get('dest_logical_unit_portal'),
+ address=lunMapping.get('dest_logical_unit_address'),
+ target=lunMapping.get('dest_logical_unit_target'),
+ password=lunMapping.get('dest_logical_unit_password'),
+ username=lunMapping.get('dest_logical_unit_username'),
)
],
),