From ab4950db472c20b57bff533f1f330b5b794aa35b Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Thu, 20 Aug 2015 12:46:46 -0400
Subject: Fixes setup.sh pxebr checks

Bug where pxebr was checking for link state UP before the subinterface
was added to the bridge.  Moved the check to be after.  Added a short
sleep in between issuing the link up and checking link status.

JIRA: OCTO-109

Change-Id: I7f782a35adf49b0da675e932d109c41b26016a5b
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 87157c0dc9bd2a3da709d1cf980cce2e9c5469a3)
---
 common/ci/setup.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'common/ci')

diff --git a/common/ci/setup.sh b/common/ci/setup.sh
index 3ffd36b..4d754a9 100755
--- a/common/ci/setup.sh
+++ b/common/ci/setup.sh
@@ -88,6 +88,7 @@ check_interface() {
   if [[ ${link_state} != 'UP' ]]; then
     echo "${blue}${interface} state is ${link_state}. Bringing it UP!${reset}"
     ip link set dev ${interface} up
+    sleep 5
     link_state=$(ip link show ${interface} | grep -oP 'state \K[^ ]+')
     if [[ ${link_state} != 'UP' ]]; then
       echo "${red}Could not bring UP interface ${interface} link state is ${link_state}${reset}"
@@ -135,9 +136,6 @@ setup_pxe_bridge() {
     echo "${green}OK!${reset}"
   fi
 
-  #Check whether PXE bridge is UP
-  check_interface ${pxe_bridge}
-
   #Add VLAN 0 (PXE) interface to PXE bridge
   echo "${blue}Checking whether VLAN 0 (PXE) interface ${pxe_interface} is added to PXE bridge ${pxe_bridge} exists${reset}"
   if ! brctl show ${pxe_bridge} 2>&1 | grep ${pxe_interface}; then
@@ -151,6 +149,9 @@ setup_pxe_bridge() {
     echo "${green}OK!${reset}"
   fi
 
+  #Check whether PXE bridge is UP
+  check_interface ${pxe_bridge}
+
   #Add Fuel Gateway IP Address to PXE bridge
   echo "${blue}Checking whether Fuel Gateway IP Address ${fuel_gw_ip} is assigned to PXE bridge ${pxe_bridge}${reset}"
   if ! ip addr show ${pxe_bridge} | grep ${fuel_gw_ip}; then
-- 
cgit 1.2.3-korg