From a4aa1062e22c40a067e5e644b46d3a3512c260ae Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Thu, 23 Jul 2015 03:05:53 +0000 Subject: [PATCH] Revert "Run test command against actual variables in ns_IPaddr2" This reverts commit 297a5575573832ce37e643a4ddceeebb0c3dfd34. Change-Id: I659efa67147366c4bd04a067330e191df68ec8bd --- files/fuel-ha-utils/ocf/ns_IPaddr2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/files/fuel-ha-utils/ocf/ns_IPaddr2 b/files/fuel-ha-utils/ocf/ns_IPaddr2 index 3d9570724c..29e1245622 100755 --- a/files/fuel-ha-utils/ocf/ns_IPaddr2 +++ b/files/fuel-ha-utils/ocf/ns_IPaddr2 @@ -299,7 +299,7 @@ ip_validate() { find_interface() { local ipaddr="$1" local netmask="$2" - [[ -z $netmask ]] || ipaddr="$ipaddr/$netmask" + [[ -z netmask ]] || ipaddr="$ipaddr/$netmask" # # List interfaces but exclude FreeS/WAN ipsecN virtual interfaces @@ -316,7 +316,7 @@ find_interface_in_ns() { local ns="$1" local ipaddr="$2" local netmask="$3" - [[ -z $netmask ]] || ipaddr="$ipaddr/$netmask" + [[ -z netmask ]] || ipaddr="$ipaddr/$netmask" # # List interfaces but exclude FreeS/WAN ipsecN virtual interfaces @@ -388,7 +388,7 @@ get_first_ip_mask_for_if() { local iface="$1" local ns="$2" local RUN='' - [[ -z $ns ]] && RUN=$RUN_IN_NS + [[ -z ns ]] && RUN=$RUN_IN_NS local addr=`$RUN ip -o -f inet a show dev $iface \ | sed -re '1!d; s|.*\s([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/[0-9]+).*|\1|'` local rc=$?