openstack/ironic
Code Issues Proposed changes

grenade: Use test_with_retry to check if route is up

Browse Source 
Instead of sleeping for 5 seconds, use test_with_retry to check if the
route is up.

Change-Id: I7055244adbc4de76f5d47375b978b04212c7f718
This commit is contained in:
John L. Villalovos 2017-07-27 10:45:00 -07:00 committed by John L. Villalovos
parent 902ebc8d24
commit ae5d65c1f7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/upgrade/resources.sh
View File

@ -67,9 +67,6 @@ function early_create {
neutron router-interface-add $NEUTRON_NET $subnet_id
neutron router-gateway-set $NEUTRON_NET public
# NOTE(vsaeinko) sleep is needed in order to setup route
sleep 5
# Add a route to the baremetal network via the Neutron public router.
# ironic-conductor will be able to access the ironic nodes via this new
# route.
@ -80,6 +77,7 @@ function early_create {
# address. This does not actually attempt to contact 8.8.8.8, it just
# determines the IP address of the interface that traffic to 8.8.8.8 would
# use. We use the IP address of this interface to setup the route.
test_with_retry "sudo ip netns exec qrouter-$router_id ip -4 route get 8.8.8.8 " "Route did not start" 60
r_net_gateway=$(sudo ip netns exec qrouter-$router_id ip -4 route get 8.8.8.8 |grep dev | awk '{print $7}')
sudo ip route replace $RESOURCES_FIXED_RANGE via $r_net_gateway