openstack
/
fuel-library
Code Issues Proposed changes

Merge "Revert "Run test command against actual variables in ns_IPaddr2""

This commit is contained in:
Jenkins 2015-07-23 06:01:07 +00:00 committed by Gerrit Code Review
parent 2bbf4256f6 a4aa1062e2
commit c280450f01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/fuel-ha-utils/ocf/ns_IPaddr2
View File

@ -299,7 +299,7 @@ ip_validate() {
find_interface() { find_interface() {
local ipaddr="$1" local ipaddr="$1"
local netmask="$2" local netmask="$2"
[[ -z $netmask ]] || ipaddr="$ipaddr/$netmask" [[ -z netmask ]] || ipaddr="$ipaddr/$netmask"
# #
# List interfaces but exclude FreeS/WAN ipsecN virtual interfaces # List interfaces but exclude FreeS/WAN ipsecN virtual interfaces
@ -316,7 +316,7 @@ find_interface_in_ns() {
local ns="$1" local ns="$1"
local ipaddr="$2" local ipaddr="$2"
local netmask="$3" local netmask="$3"
[[ -z $netmask ]] || ipaddr="$ipaddr/$netmask" [[ -z netmask ]] || ipaddr="$ipaddr/$netmask"
# #
# List interfaces but exclude FreeS/WAN ipsecN virtual interfaces # List interfaces but exclude FreeS/WAN ipsecN virtual interfaces
@ -388,7 +388,7 @@ get_first_ip_mask_for_if() {
local iface="$1" local iface="$1"
local ns="$2" local ns="$2"
local RUN='' 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 \ 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|'` | sed -re '1!d; s|.*\s([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/[0-9]+).*|\1|'`
local rc=$? local rc=$?