openstack/fuel-library
Code Issues Proposed changes

Merge "Refactor condition in "get_veth_pair""

Browse Source
This commit is contained in:
Jenkins 2016-05-17 17:14:06 +00:00 committed by Gerrit Code Review
commit cf2aa76617
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=$?