x
/
fuel-plugin-zabbix-snmptrapd
Code Issues Proposed changes

Fix network namespaces list regexp for MOS 10.0 

Change-Id: I008cab960638bafa0152cbf6da39ec1c940c0ee5
This commit is contained in:
Olivier Bourdon 2017-02-22 08:34:53 +01:00
parent 9504210a76
commit 8a2a86d679
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmpd
View File

@ -62,7 +62,7 @@ test -x $TRAPD_BINARY || exit 0
create_ns_if_not_exists() { create_ns_if_not_exists() {
[ -n "$1" ] || return 0 [ -n "$1" ] || return 0
exists=`$IP_BINARY netns | egrep "^$1\$" | wc -l` exists=`$IP_BINARY netns | egrep "^$1\$|^$1 " | wc -l`
[ $exists -le 0 ] || return 0 [ $exists -le 0 ] || return 0
$IP_BINARY netns add "$1" $IP_BINARY netns add "$1"
} }

2
deployment_scripts/puppet/modules/plugin_zabbix_snmptrapd/files/initscripts/snmptrapd
View File

@ -54,7 +54,7 @@ pidfile=/var/run/snmptrapd.pid
if [ "x$NS" != "x" ]; then if [ "x$NS" != "x" ]; then
cmd="/sbin/ip netns exec $NS $binary" cmd="/sbin/ip netns exec $NS $binary"
exists=`$IP_BINARY netns | egrep "^$1\$" | wc -l` exists=`$IP_BINARY netns | egrep "^$1\$|^$1 " | wc -l`
if [ $exists -le 0 ]; then if [ $exists -le 0 ]; then
/sbin/ip netns add $NS /sbin/ip netns add $NS
fi fi