x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Remove all lma_collector:params references in manifests 

Change-Id: I3af0eb48aca1aeb0f4d3bb6b0798a7a343bd072e
This commit is contained in:
Swann Croiset 2016-05-06 10:13:36 +02:00
parent c4e1f22b8d
commit d2eafcb750
9 changed files with 49 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment_scripts/puppet/manifests/aggregator.pp
View File

@ -32,11 +32,10 @@ $check_port = 5566
if $is_controller or $is_rabbitmq or $is_mysql_server { if $is_controller or $is_rabbitmq or $is_mysql_server {
# On nodes where pacemaker is deployed, make sure the Log and Metric collector services # On nodes where pacemaker is deployed, make sure the Log and Metric collector services
# are configured with the "pacemaker" provider # are configured with the "pacemaker" provider
include lma_collector::params Service<| title == 'log_collector' |> {
Service<| title == $lma_collector::params::log_service_name |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
Service<| title == $lma_collector::params::metric_service_name |> { Service<| title == 'metric_collector' |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
} }

61
deployment_scripts/puppet/manifests/base.pp
View File

@ -130,17 +130,10 @@ lma_collector::heka { 'metric_collector':
# to use the "pacemaker" service provider # to use the "pacemaker" service provider
if $is_controller or $is_rabbitmq or $is_mysql_server { if $is_controller or $is_rabbitmq or $is_mysql_server {
# TODO(all): remove this include from the manifest
include lma_collector::params
$log_service_name = $lma_collector::params::log_service_name
$metric_service_name = $lma_collector::params::metric_service_name
$log_config_dir = $lma_collector::params::log_config_dir
$metric_config_dir = $lma_collector::params::metric_config_dir
$rabbitmq_resource = 'master_p_rabbitmq-server' $rabbitmq_resource = 'master_p_rabbitmq-server'
if $fuel_version < 9.0 { if $fuel_version < 9.0 {
pacemaker_wrappers::service { $log_service_name: pacemaker_wrappers::service { 'log_collector':
ensure => present, ensure => present,
prefix => false, prefix => false,
primitive_class => 'ocf', primitive_class => 'ocf',
@ -155,9 +148,9 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
'failure-timeout' => '120', 'failure-timeout' => '120',
}, },
parameters => { parameters => {
'service_name' => $log_service_name, 'service_name' => 'log_collector',
'config' => $log_config_dir, 'config' => '/etc/log_collector',
'log_file' => "/var/log/${log_service_name}.log", 'log_file' => '/var/log/log_collector.log',
'user' => $heka_user, 'user' => $heka_user,
}, },
operations => { operations => {
@ -178,29 +171,29 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
if $is_rabbitmq { if $is_rabbitmq {
cs_rsc_colocation { "${log_service_name}-with-rabbitmq": cs_rsc_colocation { "${log_service_name}-with-rabbitmq":
ensure => present, ensure => present,
alias => $log_service_name, alias => 'log_collector',
primitives => ["clone_${log_service_name}", $rabbitmq_resource], primitives => ['clone_log_collector', $rabbitmq_resource],
score => 0, score => 0,
require => Pacemaker_wrappers::Service[$log_service_name], require => Pacemaker_wrappers::Service['log_collector'],
} }
cs_rsc_order { "${log_service_name}-after-rabbitmq": cs_rsc_order { 'log_collector-after-rabbitmq':
ensure => present, ensure => present,
alias => $log_service_name, alias => 'log_collector',
first => $rabbitmq_resource, first => $rabbitmq_resource,
second => "clone_${log_service_name}", second => 'clone_log_collector',
# Heka cannot start if RabbitMQ isn't ready to accept connections. But # Heka cannot start if RabbitMQ isn't ready to accept connections. But
# once it is initialized, it can recover from a RabbitMQ outage. This is # once it is initialized, it can recover from a RabbitMQ outage. This is
# why we set score to 0 (interleave) meaning that the collector should # why we set score to 0 (interleave) meaning that the collector should
# start once RabbitMQ is active but a restart of RabbitMQ # start once RabbitMQ is active but a restart of RabbitMQ
# won't trigger a restart of the LMA collector. # won't trigger a restart of the LMA collector.
score => 0, score => 0,
require => Cs_rsc_colocation[$log_service_name], require => Cs_rsc_colocation['log_collector'],
before => Class['lma_collector'], before => Class['lma_collector'],
} }
} }
pacemaker_wrappers::service { $metric_service_name: pacemaker_wrappers::service { 'metric_collector':
ensure => present, ensure => present,
prefix => false, prefix => false,
primitive_class => 'ocf', primitive_class => 'ocf',
@ -214,9 +207,9 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
'failure-timeout' => '120', 'failure-timeout' => '120',
}, },
parameters => { parameters => {
'service_name' => $metric_service_name, 'service_name' => 'metric_collector',
'config' => $metric_config_dir, 'config' => '/etc/metric_collector',
'log_file' => "/var/log/${metric_service_name}.log", 'log_file' => '/var/log/metric_collector.log',
'user' => $heka_user, 'user' => $heka_user,
}, },
operations => { operations => {
@ -233,7 +226,7 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
ocf_script_file => 'lma_collector/ocf-lma_collector', ocf_script_file => 'lma_collector/ocf-lma_collector',
} }
} else { } else {
pacemaker::service { $log_service_name: pacemaker::service { 'log_collector':
ensure => present, ensure => present,
prefix => false, prefix => false,
primitive_class => 'ocf', primitive_class => 'ocf',
@ -248,9 +241,9 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
'failure-timeout' => '120', 'failure-timeout' => '120',
}, },
parameters => { parameters => {
'service_name' => $log_service_name, 'service_name' => 'log_collector',
'config' => $log_config_dir, 'config' => '/etc/log_collector',
'log_file' => "/var/log/${log_service_name}.log", 'log_file' => '/var/log/log_collector.log',
'user' => $heka_user, 'user' => $heka_user,
}, },
operations => { operations => {
@ -269,17 +262,17 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
} }
if $is_rabbitmq { if $is_rabbitmq {
pcmk_colocation { "${log_service_name}-with-rabbitmq": pcmk_colocation { 'log_collector-with-rabbitmq':
ensure => present, ensure => present,
alias => $log_service_name, alias => 'log_collector',
first => $rabbitmq_resource, first => $rabbitmq_resource,
second => "clone_${log_service_name}", second => 'clone_log_collector',
score => 0, score => 0,
require => Pacemaker::Service[$log_service_name], require => Pacemaker::Service['log_collector'],
} }
} }
pacemaker::service { $metric_service_name: pacemaker::service { 'metric_collector':
ensure => present, ensure => present,
prefix => false, prefix => false,
primitive_class => 'ocf', primitive_class => 'ocf',
@ -293,9 +286,9 @@ if $is_controller or $is_rabbitmq or $is_mysql_server {
'failure-timeout' => '120', 'failure-timeout' => '120',
}, },
parameters => { parameters => {
'service_name' => $metric_service_name, 'service_name' => 'metric_collector',
'config' => $metric_config_dir, 'config' => '/etc/metric_collector',
'log_file' => "/var/log/${metric_service_name}.log", 'log_file' => '/var/log/metric_collector.log',
'user' => $heka_user, 'user' => $heka_user,
}, },
operations => { operations => {

7
deployment_scripts/puppet/manifests/cinder.pp
View File

@ -14,8 +14,6 @@
notice('fuel-plugin-lma-collector: cinder.pp') notice('fuel-plugin-lma-collector: cinder.pp')
include lma_collector::params
$ceilometer = hiera_hash('ceilometer', {}) $ceilometer = hiera_hash('ceilometer', {})
$lma_collector = hiera_hash('lma_collector') $lma_collector = hiera_hash('lma_collector')
$is_controller = roles_include(['controller', 'primary-controller']) $is_controller = roles_include(['controller', 'primary-controller'])
@ -25,11 +23,10 @@ $is_mysql_server = roles_include(['standalone-database', 'primary-standalone-dat
if $is_controller or $is_rabbitmq or $is_mysql_server { if $is_controller or $is_rabbitmq or $is_mysql_server {
# On nodes where pacemaker is deployed, make sure Log and Metric collector services # On nodes where pacemaker is deployed, make sure Log and Metric collector services
# are configured with the "pacemaker" provider # are configured with the "pacemaker" provider
include lma_collector::params Service<| title == 'log_collector' |> {
Service<| title == $lma_collector::params::log_service_name |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
Service<| title == $lma_collector::params::metric_service_name |> { Service<| title == 'metric_collector' |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
} }

4
deployment_scripts/puppet/manifests/cleanup_apt_config.pp
View File

@ -14,11 +14,9 @@
notice('fuel-plugin-lma-collector: cleanup_apt_config.pp') notice('fuel-plugin-lma-collector: cleanup_apt_config.pp')
include lma_collector::params
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
file { $::lma_collector::params::apt_config_file: file { '/etc/apt/apt.conf.d/99norecommends':
ensure => absent, ensure => absent,
} }
} }

2
deployment_scripts/puppet/manifests/compute.pp
View File

@ -14,8 +14,6 @@
notice('fuel-plugin-lma-collector: compute.pp') notice('fuel-plugin-lma-collector: compute.pp')
include lma_collector::params
$ceilometer = hiera_hash('ceilometer', {}) $ceilometer = hiera_hash('ceilometer', {})
$lma_collector = hiera_hash('lma_collector') $lma_collector = hiera_hash('lma_collector')

13
deployment_scripts/puppet/manifests/configure_afd_filters.pp
View File

@ -14,8 +14,6 @@
notice('fuel-plugin-lma-collector: configure_afd_filters.pp') notice('fuel-plugin-lma-collector: configure_afd_filters.pp')
include lma_collector::params
$lma = hiera_hash('lma_collector', {}) $lma = hiera_hash('lma_collector', {})
$is_controller = roles_include(['controller', 'primary-controller']) $is_controller = roles_include(['controller', 'primary-controller'])
$is_rabbitmq = roles_include(['standalone-rabbitmq', 'primary-standalone-rabbitmq']) $is_rabbitmq = roles_include(['standalone-rabbitmq', 'primary-standalone-rabbitmq'])
@ -29,11 +27,10 @@ if $alarms_definitions == undef {
if $is_controller or $is_rabbitmq or $is_mysql_server { if $is_controller or $is_rabbitmq or $is_mysql_server {
# On nodes where pacemaker is deployed, make sure the LMA service is # On nodes where pacemaker is deployed, make sure the LMA service is
# configured with the "pacemaker" provider # configured with the "pacemaker" provider
include lma_collector::params Service<| title == 'log_collector' |> {
Service<| title == $lma_collector::params::log_service_name |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
Service<| title == $lma_collector::params::metric_service_name |> { Service<| title == 'metric_collector' |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
} }
@ -69,8 +66,10 @@ if $alerting_mode == 'remote' {
} }
$nagios_user = $lma_infra_alerting['nagios_user'] $nagios_user = $lma_infra_alerting['nagios_user']
$nagios_password = $lma_infra_alerting['nagios_password'] $nagios_password = $lma_infra_alerting['nagios_password']
$http_port = $lma_collector::params::nagios_http_port # Important: $http_port and $http_path must match the
$http_path = $lma_collector::params::nagios_http_path # lma_infra_monitoring configuration.
$http_port = 8001
$http_path = 'cgi-bin/cmd.cgi'
$nagios_url = "http://${nagios_server}:${http_port}/${http_path}" $nagios_url = "http://${nagios_server}:${http_port}/${http_path}"
} else { } else {
if ! $lma_infra_alerting { if ! $lma_infra_alerting {

4
deployment_scripts/puppet/manifests/configure_apt.pp
View File

@ -14,15 +14,13 @@
notice('fuel-plugin-lma-collector: configure_apt.pp') notice('fuel-plugin-lma-collector: configure_apt.pp')
include lma_collector::params
$str = 'APT::Install-Suggests "0"; $str = 'APT::Install-Suggests "0";
APT::Install-Recommends "0"; APT::Install-Recommends "0";
' '
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
file { $::lma_collector::params::apt_config_file: file { '/etc/apt/apt.conf.d/99norecommends':
ensure => file, ensure => file,
content => $str, content => $str,
} }

21
deployment_scripts/puppet/manifests/controller.pp
View File

@ -19,8 +19,6 @@ $messaging_address = get_network_role_property('mgmt/messaging', 'ipaddr')
$memcache_address = get_network_role_property('mgmt/memcache', 'ipaddr') $memcache_address = get_network_role_property('mgmt/memcache', 'ipaddr')
$network_metadata = hiera_hash('network_metadata') $network_metadata = hiera_hash('network_metadata')
include lma_collector::params
$ceilometer = hiera_hash('ceilometer', {}) $ceilometer = hiera_hash('ceilometer', {})
$lma_collector = hiera_hash('lma_collector') $lma_collector = hiera_hash('lma_collector')
$rabbit = hiera_hash('rabbit') $rabbit = hiera_hash('rabbit')
@ -49,11 +47,10 @@ else {
# Make sure the Log and Metric collector services are configured with the # Make sure the Log and Metric collector services are configured with the
# "pacemaker" provider # "pacemaker" provider
include lma_collector::params Service<| title == 'log_collector' |> {
Service<| title == $lma_collector::params::log_service_name |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
Service<| title == $lma_collector::params::metric_service_name |> { Service<| title == 'metric_collector' |> {
provider => 'pacemaker' provider => 'pacemaker'
} }
@ -439,7 +436,7 @@ if $influxdb_mode != 'disabled' {
} }
if $use_local_influxdb or $use_remote_influxdb { if $use_local_influxdb or $use_remote_influxdb {
$influxdb_url = "http://${influxdb_server}:${lma_collector::params::influxdb_port}/ping" $influxdb_url = "http://${influxdb_server}:8086/ping"
} }
$vip_urls = { $vip_urls = {
@ -482,13 +479,13 @@ if $alerting_mode == 'remote' {
# Important: $http_port and $http_path must match the # Important: $http_port and $http_path must match the
# lma_infra_monitoring configuration. # lma_infra_monitoring configuration.
$http_port = $lma_collector::params::nagios_http_port $http_port = 8001
$http_path = $lma_collector::params::nagios_http_path $http_path = 'cgi-bin/cmd.cgi'
$nagios_url = "http://${nagios_server}:${http_port}/${http_path}" $nagios_url = "http://${nagios_server}:${http_port}/${http_path}"
} }
} elsif $alerting_mode == 'standalone' { } elsif $alerting_mode == 'standalone' {
$use_nagios = false $use_nagios = false
$subject = "${lma_collector::params::smtp_subject} environment ${deployment_id}" $subject = "LMA Alert Notification - environment ${deployment_id}"
class { 'lma_collector::smtp_alert': class { 'lma_collector::smtp_alert':
send_from => $lma_collector['alerting_send_from'], send_from => $lma_collector['alerting_send_from'],
send_to => [$lma_collector['alerting_send_to']], send_to => [$lma_collector['alerting_send_to']],
@ -509,7 +506,8 @@ if $use_nagios {
user => $nagios_user, user => $nagios_user,
password => $nagios_password, password => $nagios_password,
message_type => $lma_collector['gse_cluster_global']['output_message_type'], message_type => $lma_collector['gse_cluster_global']['output_message_type'],
virtual_hostname => $lma_collector::params::nagios_hostname_for_cluster_global, # Following parameter must match the lma_infrastructure_alerting::params::nagios_global_vhostname_prefix
virtual_hostname => '00-global-clusters',
} }
lma_collector::gse_nagios { 'node_clusters': lma_collector::gse_nagios { 'node_clusters':
@ -518,6 +516,7 @@ if $use_nagios {
user => $nagios_user, user => $nagios_user,
password => $nagios_password, password => $nagios_password,
message_type => $lma_collector['gse_cluster_node']['output_message_type'], message_type => $lma_collector['gse_cluster_node']['output_message_type'],
virtual_hostname => $lma_collector::params::nagios_hostname_for_cluster_nodes, # Following parameter must match the lma_infrastructure_alerting::params::nagios_node_vhostname_prefix
virtual_hostname => '00-node-clusters',
} }
} }

9
deployment_scripts/puppet/modules/lma_collector/manifests/params.pp
View File

@ -21,8 +21,6 @@ class lma_collector::params {
# Lua plugins are shared across log and metric collectors # Lua plugins are shared across log and metric collectors
$plugins_dir = '/usr/share/lma_collector' $plugins_dir = '/usr/share/lma_collector'
$apt_config_file = '/etc/apt/apt.conf.d/99norecommends'
$pacemaker_managed = false $pacemaker_managed = false
# Address and port of the Heka dashboard for health reports. # Address and port of the Heka dashboard for health reports.
@ -174,18 +172,11 @@ class lma_collector::params {
# Nagios parameters # Nagios parameters
# #
$nagios_server = 'localhost' $nagios_server = 'localhost'
$nagios_http_port = 8001
$nagios_http_path = 'cgi-bin/cmd.cgi'
$nagios_user = 'nagiosadmin' $nagios_user = 'nagiosadmin'
$nagios_password = '' $nagios_password = ''
$nagios_timeout = 2 $nagios_timeout = 2
# Following parameter must match the lma_infrastructure_alerting::params::nagios_openstack_dummy_hostname
$nagios_hostname_for_cluster_global = '00-global-clusters'
$nagios_hostname_for_cluster_nodes = '00-node-clusters'
# Parameters for SMTP alert of service status # Parameters for SMTP alert of service status
$smtp_from = 'lma-alert@localhost.localdomain' $smtp_from = 'lma-alert@localhost.localdomain'
$smtp_subject = 'LMA Alert Notification'
$smtp_send_interval = 0 $smtp_send_interval = 0
} }