This commit is contained in:
James Tanner 2016-08-01 22:47:26 -04:00
parent 5d2d0e0045
commit a3f415a892

View file

@ -280,11 +280,8 @@ class PyVmomiHelper(object):
if current_state == expected_state: if current_state == expected_state:
result['changed'] = False result['changed'] = False
result['failed'] = False result['failed'] = False
else: else:
task = None task = None
try: try:
if expected_state == 'poweredoff': if expected_state == 'poweredoff':
task = vm.PowerOff() task = vm.PowerOff()
@ -341,9 +338,6 @@ class PyVmomiHelper(object):
mac = device.macAddress mac = device.macAddress
ips = list(device.ipAddress) ips = list(device.ipAddress)
netDict[mac] = ips netDict[mac] = ips
#facts['network'] = {}
#facts['network']['ipaddress_v4'] = None
#facts['network']['ipaddress_v6'] = None
for k,v in netDict.iteritems(): for k,v in netDict.iteritems():
for ipaddress in v: for ipaddress in v:
if ipaddress: if ipaddress:
@ -353,7 +347,6 @@ class PyVmomiHelper(object):
facts['ipv4'] = ipaddress facts['ipv4'] = ipaddress
for idx,entry in enumerate(vm.config.hardware.device): for idx,entry in enumerate(vm.config.hardware.device):
if not hasattr(entry, 'macAddress'): if not hasattr(entry, 'macAddress'):
continue continue
@ -368,7 +361,6 @@ class PyVmomiHelper(object):
} }
facts['hw_interfaces'].append('eth'+str(idx)) facts['hw_interfaces'].append('eth'+str(idx))
#import epdb; epdb.st()
return facts return facts