function wait_vhost0_up => common/functions.sh

Signed-off-by: Gleb Galkin <[email protected]>
Change-Id: Ieb09abae8ef0d310b8ba0fff8da0b9d69744d1c7

Author: gleb108

ansible/run.sh

@@ -141,15 +141,6 @@ function openstack() {
     fi
 }
 
-function wait_vhost0_up() {
-    local node
-    for node in ${AGENT_NODES} ; do
-        scp $SSH_OPTIONS ${fmy_dir}/functions.sh ${node}:/tmp/functions.sh
-        if ! ssh $SSH_OPTIONS ${node} "export PATH=\$PATH:/usr/sbin ; source /tmp/functions.sh ; wait_nic_up vhost0" ; then
-            return 1
-        fi
-    done
-}
 
 function tf() {
     current_container_tag=$(cat $tf_deployer_dir/instances.yaml | python3 -c "import yaml, sys ; data = yaml.safe_load(sys.stdin.read()); print(data['contrail_configuration']['CONTRAIL_CONTAINER_TAG'])")
@@ -175,7 +166,7 @@ function tf() {
         -e config_file=$tf_deployer_dir/instances.yaml \
         $tf_deployer_dir/playbooks/install_contrail.yml
 
-    if ! wait_cmd_success wait_vhost0_up 5 24
+    if ! wait_cmd_success "wait_vhost0_up ${AGENT_NODES}" 5 24
     then
         echo "vhost0 interface(s) cannot obtain an IP address"
         return 1

common/functions.sh

@@ -100,6 +100,19 @@ function wait_nic_up() {
   echo "INFO: $nic is up"
 }
 
+function wait_vhost0_up() {
+    local node
+    local node_list=$@
+    for node in $(echo $node_list | tr ',' ' ') ; do
+        scp $SSH_OPTIONS ${fmy_dir}/functions.sh ${node}:/tmp/functions.sh
+        echo "INFO: Waiting for vhost0 is up on $node"
+        if ! ssh $SSH_OPTIONS ${node} "export PATH=\$PATH:/usr/sbin ; source /tmp/functions.sh ; wait_nic_up vhost0" ; then
+            return 1
+        fi
+    done
+}
+
+
 function nic_has_ip() {
   local nic=$1
   if nic_ip=$(ip addr show $nic | grep -o "inet [0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | grep -o "[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*"); then

helm/deploy_tf_helm.sh

@@ -45,16 +45,6 @@ function kill_helm_serve() {
   fi
 }
 
-function wait_vhost0_up() {
-  local a=$1
-  local d="$(basename $(dirname $my_dir))"
-  if ! ip a | grep -q "${a}"; then
-    ssh $SSH_OPTIONS ${a} "export PATH=\$PATH:/usr/sbin ; source /tmp/${d}/common/functions.sh ; wait_nic_up vhost0"
-  else
-    wait_nic_up vhost0
-  fi
-}
-
 trap 'catch_errors' ERR
 function catch_errors() {
   local exit_code=$?
@@ -115,10 +105,15 @@ fi
 
 kubectl create ns tungsten-fabric || :
 helm upgrade --install --namespace tungsten-fabric tungsten-fabric $WORKSPACE/tf-helm-deployer/$TF_CHART -f $WORKSPACE/tf-devstack-values.yaml $host_var
+REMOTE_AGENT_NODES=''
 if [[ $ORCHESTRATOR == "openstack" ]] ; then
   for machine in $AGENT_NODES ; do
-    wait_vhost0_up $machine
+      if ! ip a | grep -q "${machine}"; then
+          REMOTE_AGENT_NODES+="${machine} "
+      fi
   done
+  wait_nic_up vhost0
+  wait_vhost0_up $REMOTE_AGENT_NODES
 
   # upgrade of neutron and nova containers with tf ones
   helm upgrade neutron $WORKSPACE/openstack-helm/neutron --namespace=openstack --force --reuse-values \
@@ -128,11 +123,13 @@ if [[ $ORCHESTRATOR == "openstack" ]] ; then
 fi
 
 # multinodes "wait_nic_up vhost0"
+REMOTE_CONTROLLER_NODES=''
 for machine in $CONTROLLER_NODES ; do
   if echo $AGENT_NODES | grep -q $machine ; then
-    wait_vhost0_up $machine
+      REMOTE_CONTROLLER_NODES+="$machine "
   fi
 done
+wait_vhost0_up $REMOTE_CONTROLLER_NODES
 
 label_nodes_by_ip opencontrail.org/controller=enabled $CONTROLLER_NODES
 

openshift/functions.sh

@@ -154,13 +154,4 @@ function monitor_csr() {
   done
 }
 
-function wait_vhost0_up() {
-    local node
-    for node in $(echo ${CONTROLLER_NODES} ${AGENT_NODES} | tr ',' ' ') ; do
-        scp $SSH_OPTIONS ${fmy_dir}/functions.sh ${node}:/tmp/functions.sh
-        if ! ssh $SSH_OPTIONS ${node} "export PATH=\$PATH:/usr/sbin ; source /tmp/functions.sh ; wait_nic_up vhost0" ; then
-            return 1
-        fi
-    done
-}
 

operator/functions.sh

@@ -127,16 +127,6 @@ EOF
 }
 
 
-function wait_vhost0_up() {
-    local node
-    for node in $(echo ${CONTROLLER_NODES} ${AGENT_NODES} | tr ',' ' ') ; do
-        scp $SSH_OPTIONS ${fmy_dir}/functions.sh ${node}:/tmp/functions.sh
-        if ! ssh $SSH_OPTIONS ${node} "export PATH=\$PATH:/usr/sbin ; source /tmp/functions.sh ; wait_nic_up vhost0" ; then
-            return 1
-        fi
-    done
-}
-
 function rhel_setup_all_the_nodes()
 {
     local jobs=""

operator/run.sh

@@ -142,7 +142,7 @@ function tf() {
     # apply contrail cluster
     kubectl apply -k $OPERATOR_REPO/deploy/kustomize/contrail/templates/
 
-    if ! wait_cmd_success wait_vhost0_up 5 24; then
+    if ! wait_cmd_success "wait_vhost0_up ${CONTROLLER_NODES}, ${AGENT_NODES}" 5 24; then
         echo "vhost0 interface(s) cannot obtain an IP address"
         return 1
     fi