aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-21 05:58:25 +0000
committerGerrit Code Review <review@openstack.org>2016-06-21 05:58:25 +0000
commitbb2ac5f6f97116baf6836fbc74bf16d1205a37e6 (patch)
tree24a651987d4a54e26b4a76c0fad2eff0b153846e
parent438dd53bf75b1383d7d6cd554828c6694d4510c3 (diff)
parent9895e98d17a0ecf70711ef8e5aa4fdbbcd5bf7cf (diff)
downloadkolla-bb2ac5f6f97116baf6836fbc74bf16d1205a37e6.tar.gz
kolla-bb2ac5f6f97116baf6836fbc74bf16d1205a37e6.zip
Merge "Use MAC address for looking for DHCP leases for Vagrant"
-rw-r--r--dev/vagrant/newest_dhcp_lease.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/dev/vagrant/newest_dhcp_lease.py b/dev/vagrant/newest_dhcp_lease.py
index 64a8e53da..f2ad1dcaf 100644
--- a/dev/vagrant/newest_dhcp_lease.py
+++ b/dev/vagrant/newest_dhcp_lease.py
@@ -59,10 +59,13 @@ def get_vir_network_dhcp_lease(conn, vm_name):
That's the current official way for getting DHCP leases and this
information isn't stored anywhere else anymore.
"""
+ domain_name = 'vagrant_' + vm_name
+ mac_address = get_mac_address(conn, domain_name)
+
network = conn.networkLookupByName('vagrant-private-dhcp')
dhcp_leases = libvirt.virNetwork.DHCPLeases(network)
- vm_dhcp_leases = filter(lambda lease: lease['hostname'] == vm_name,
+ vm_dhcp_leases = filter(lambda lease: lease['mac'] == mac_address,
dhcp_leases)
newest_vm_dhcp_lease = sorted(vm_dhcp_leases,