openstack/fuel-library
Code Issues Proposed changes

Refactor condition in "get_veth_pair"

Browse Source 
* seems there is no need to have grep output,
  so added "-q"
* to prevent "false positive" "-w" key would
  prevent matching similar namespaces
* grep is a condition, so there is no need
  to do checks around return code
* try to use namespace in test expression

Closes-bug: #1582645

Change-Id: I7f38c2657541666c989f8e39e1c5a0e475d042f2
This commit is contained in:
dmburmistrov 2016-05-06 13:32:09 +03:00 committed by Dmitry Burmistrov
parent 8e9f3252a2
commit 71cd8e2870
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/fuel-ha-utils/ocf/ns_conntrackd
View File

@ -161,9 +161,10 @@ add_to_bridge() {
}
get_veth_pair() {
ip netns list | grep "$OCF_RESKEY_ns"
[[ $? != 0 ]] && ip netns add $OCF_RESKEY_ns && ip netns exec $OCF_RESKEY_ns ip link set up dev lo
if ! ip netns exec "$OCF_RESKEY_ns" ip link show dev lo up | grep -wq 'lo:'; then
ip netns add "$OCF_RESKEY_ns"
ip netns exec "$OCF_RESKEY_ns" ip link set up dev lo
fi
ocf_run ip netns exec $OCF_RESKEY_ns ip link show $OCF_RESKEY_ns_interface 2>/dev/null
rc=$?