x
/
fuel-plugin-lma-infrastructure-alerting
Code Issues Proposed changes

Run Nagios in the default network namespace 

This is useless to run Nagios in a dedicated namespace and this way, Nagios is
able to communicate with external networks (eg. to send SMTP notifications).

Change-Id: Ica543c29412f109db11dc3bd18ae9e8cecdf1817
This commit is contained in:
Swann Croiset 2016-07-13 09:39:59 +02:00
parent a6b9c585b2
commit c1febe55ff
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment_scripts/puppet/manifests/nagios.pp
View File

@ -180,9 +180,6 @@ if $fuel_version < 9.0 {
# Nagios resources for Pacemaker
pacemaker_wrappers::service { 'nagios3':
primitive_type => 'ocf-ns_nagios',
parameters => {
'ns' => 'infrastructure_alerting',
},
metadata => {
'migration-threshold' => '3',
'failure-timeout' => '120',
@ -265,9 +262,6 @@ if $fuel_version < 9.0 {
# Nagios resources for Pacemaker
pacemaker::service { 'nagios3':
primitive_type => 'ocf-ns_nagios',
parameters => {
'ns' => 'infrastructure_alerting',
},
metadata => {
'migration-threshold' => '3',
'failure-timeout' => '120',

30
deployment_scripts/puppet/modules/lma_infra_alerting/files/ocf-ns_nagios
View File

@ -39,10 +39,10 @@ OCF_RESKEY_ns_default=
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
: ${OCF_RESKEY_ns=${OCF_RESKEY_ns_default}}
RUN_IN_NS="ip netns exec $OCF_RESKEY_ns "
if [ -z "${OCF_RESKEY_ns}" ] ; then
RUN=''
else
RUN_IN_NS="ip netns exec $OCF_RESKEY_ns "
RUN="$RUN_IN_NS "
fi
NAGIOS_PID_FILE="/var/run/nagios3/nagios3.pid"
@ -129,19 +129,21 @@ service_validate() {
return "$OCF_ERR_INSTALLED"
fi
if ! ip netns pids "$OCF_RESKEY_ns" > /dev/null 2>&1; then
# The network namespace needs to be created first
ocf_run ip netns add $OCF_RESKEY_ns
rc=$?
if [ $rc -ne 0 ]; then
ocf_log err "Namespace $OCF_RESKEY_ns can't be created (error=$rc)"
return "$OCF_ERR_INSTALLED"
fi
# This is required for Linux kernels >= 3.19. Previously the
# net.ipv4.ip_nonlocal_bind setting was global to all namespaces but
# starting with this version, it is per namespace.
ocf_run ${RUN_IN_NS} /sbin/sysctl -w net.ipv4.ip_nonlocal_bind=1
ocf_run ${RUN_IN_NS} ip link set up dev lo
if [ -n "${OCF_RESKEY_ns}" ]; then
if ! ip netns pids "$OCF_RESKEY_ns" > /dev/null 2>&1; then
# The network namespace needs to be created first
ocf_run ip netns add $OCF_RESKEY_ns
rc=$?
if [ $rc -ne 0 ]; then
ocf_log err "Namespace $OCF_RESKEY_ns can't be created (error=$rc)"
return "$OCF_ERR_INSTALLED"
fi
# This is required for Linux kernels >= 3.19. Previously the
# net.ipv4.ip_nonlocal_bind setting was global to all namespaces but
# starting with this version, it is per namespace.
ocf_run ${RUN_IN_NS} /sbin/sysctl -w net.ipv4.ip_nonlocal_bind=1
ocf_run ${RUN_IN_NS} ip link set up dev lo
fi
fi
# Make sure that the Nagios run directory exists and has the appropriate ownership