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

Add ordering constraints between Apache and VIPs 

This ensures that the Nagios Apache service won't start until the VIP
interfaces are up and running. This is required because the Apache OCF
script needs to tweak the ARP parameters of the VIP interfaces.

Change-Id: I4cc7b7db06cda31064b22e0283af478228202b54
Related-Bug: #1594722
This commit is contained in:
Simon Pasquier 2016-07-21 11:03:54 +02:00
parent 00980a0703
commit 584d2f0eea
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,6 +170,21 @@ if $fuel_version < 9.0 {
require => [File['ocf-ns_apache'], Exec['net.ipv4.ip_nonlocal_bind'], Class['lma_infra_alerting::nagios']],
}
# Apache needs to start after the VIP interfaces are up and running
cs_rsc_order { 'apache2-nagios-after-mgmt-vip':
ensure => present,
first => 'vip__infrastructure_alerting_mgmt_vip',
second => 'apache2-nagios',
require => Cs_resource['apache2-nagios'],
}
cs_rsc_order { 'apache2-nagios-after-ui-vip':
ensure => present,
first => 'vip__infrastructure_alerting_ui',
second => 'apache2-nagios',
require => Cs_resource['apache2-nagios'],
}
cs_rsc_colocation { 'infrastructure_alerting_vip-with-apache2-nagios':
ensure => present,
score => 'INFINITY',
@ -215,7 +230,7 @@ if $fuel_version < 9.0 {
}
# The two VIPs must be colocated
# This assumes that the VIPs have already been created
# It assumes that the VIPs have already been created at a previous stage
cs_rsc_colocation { 'ui_vip-with-wsgi_vip':
ensure => present,
score => 'INFINITY',
@ -258,6 +273,21 @@ if $fuel_version < 9.0 {
require => Pacemaker::Service['apache2-nagios'],
}
# Apache needs to start after the VIP interfaces are up and running
pcmk_order { 'apache2-nagios-after-mgmt-vip':
ensure => present,
first => 'vip__infrastructure_alerting_mgmt_vip',
second => 'apache2-nagios',
require => Pacemaker::Service['apache2-nagios'],
}
pcmk_order { 'apache2-nagios-after-ui-vip':
ensure => present,
first => 'vip__infrastructure_alerting_ui',
second => 'apache2-nagios',
require => Pacemaker::Service['apache2-nagios'],
}
# Nagios resources for Pacemaker
pacemaker::service { 'nagios3':
primitive_type => 'ocf-ns_nagios',
@ -291,7 +321,7 @@ if $fuel_version < 9.0 {
}
# The two VIPs must be colocated
# This assumes VIPs are already created
# It assumes that the VIPs have already been created at a previous stage
pcmk_colocation { 'ui_vip-with-wsgi_vip':
ensure => present,
score => 'INFINITY',