openstack/bifrost
Code Issues Proposed changes

Fix the dhcp checks on centos

Browse Source 
It is using a different pathf or leases, so pick it properly.

Change-Id: If2ab2b0dc116587976859cc7653affc0b19aedcd
This commit is contained in:
Yolanda Robla 2017-08-31 10:10:07 +02:00
parent 53c7656d65
commit 2dc2ca7a24
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
playbooks/roles/bifrost-test-dhcp/files/test-dhcp.py
View File

@ -72,10 +72,15 @@ def main(argv):
# now check that we only have these entries in leases file
leases = []
if not os.path.exists('/var/lib/misc/dnsmasq.leases'):
print('ERROR: dnsmasq leases file has not been generated')
sys.exit(1)
if not os.path.exists('/var/lib/dnsmasq/dnsmasq.leases'):
print('ERROR: dnsmasq leases file has not been generated')
sys.exit(1)
else:
dns_path = '/var/lib/dnsmasq/dnsmasq.leases'
else:
dns_path = '/var/lib/misc/dnsmasq.leases'
with open('/var/lib/misc/dnsmasq.leases') as csvfile:
with open(dns_path) as csvfile:
leases_reader = csv.reader(csvfile, delimiter=' ')
for row in leases_reader:
leases.append(row)