Merge pull request #31 from johnpc35/master
Fix QEMU guest agent IP address retrieval
This commit is contained in:
commit
0477e6df06
28
proxmox.py
28
proxmox.py
|
@ -208,14 +208,26 @@ class ProxmoxAPI(object):
|
||||||
if type(networks) is dict:
|
if type(networks) is dict:
|
||||||
for network in networks:
|
for network in networks:
|
||||||
for ip_address in ['ip-address']:
|
for ip_address in ['ip-address']:
|
||||||
try:
|
try:
|
||||||
# IP address validation
|
# IP address validation
|
||||||
if socket.inet_aton(ip_address):
|
if socket.inet_aton(ip_address):
|
||||||
# Ignore localhost
|
# Ignore localhost
|
||||||
if ip_address != '127.0.0.1':
|
if ip_address != '127.0.0.1':
|
||||||
return ip_address
|
return ip_address
|
||||||
except socket.error:
|
except socket.error:
|
||||||
pass
|
pass
|
||||||
|
elif type(networks) is list:
|
||||||
|
for network in networks:
|
||||||
|
if 'ip-addresses' in network:
|
||||||
|
for ip_address in network['ip-addresses']:
|
||||||
|
try:
|
||||||
|
# IP address validation
|
||||||
|
if socket.inet_aton(ip_address['ip-address']):
|
||||||
|
# Ignore localhost
|
||||||
|
if ip_address['ip-address'] != '127.0.0.1':
|
||||||
|
return ip_address['ip-address']
|
||||||
|
except socket.error:
|
||||||
|
pass
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def openvz_ip_address(self, node, vm):
|
def openvz_ip_address(self, node, vm):
|
||||||
|
|
Reference in New Issue