cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #785 from srvg/bug/openiscsi-emptylist

Browse source 
open_iscsi: return devicenodes as empty list if no LUN's
This commit is contained in:
Brian Coca 2015-07-29 20:16:50 -04:00
commit aa747818d9
1 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
system/open_iscsi.py
View file

@ -108,6 +108,7 @@ import time
ISCSIADM = 'iscsiadm' ISCSIADM = 'iscsiadm'
def compare_nodelists(l1, l2): def compare_nodelists(l1, l2):
l1.sort() l1.sort()
@ -206,18 +207,15 @@ def target_device_node(module, target):
# a given target... # a given target...
devices = glob.glob('/dev/disk/by-path/*%s*' % target) devices = glob.glob('/dev/disk/by-path/*%s*' % target)
if len(devices) == 0: devdisks = []
return None for dev in devices:
else: # exclude partitions
devdisks = [] if "-part" not in dev:
for dev in devices: devdisk = os.path.realpath(dev)
# exclude partitions # only add once (multi-path?)
if "-part" not in dev: if devdisk not in devdisks:
devdisk = os.path.realpath(dev) devdisks.append(devdisk)
# only add once (multi-path?) return devdisks
if devdisk not in devdisks:
devdisks.append(devdisk)
return devdisks
def target_isauto(module, target): def target_isauto(module, target):
@ -333,17 +331,17 @@ def main():
result['nodes'] = nodes result['nodes'] = nodes
if login is not None: if login is not None:
loggedon = target_loggedon(module,target) loggedon = target_loggedon(module, target)
if (login and loggedon) or (not login and not loggedon): if (login and loggedon) or (not login and not loggedon):
result['changed'] |= False result['changed'] |= False
if login: if login:
result['devicenodes'] = target_device_node(module,target) result['devicenodes'] = target_device_node(module, target)
elif not check: elif not check:
if login: if login:
target_login(module, target) target_login(module, target)
# give udev some time # give udev some time
time.sleep(1) time.sleep(1)
result['devicenodes'] = target_device_node(module,target) result['devicenodes'] = target_device_node(module, target)
else: else:
target_logout(module, target) target_logout(module, target)
result['changed'] |= True result['changed'] |= True
@ -371,7 +369,6 @@ def main():
module.exit_json(**result) module.exit_json(**result)
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *