x
/
puppet-midonet
Code Issues Proposed changes

Doesn't make analytics manifests 💣 on RHEL7 

Change-Id: I7d1f5cc753802ae8112086a4ec42cdd777603dc0
This commit is contained in:
Alejandro Andreu 2017-02-20 17:49:01 +01:00
parent c93158418e
commit 442a585485
2 changed files with 155 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
manifests/analytics.pp
View File

@ -118,11 +118,13 @@ class midonet::analytics (
if versioncmp($midonet_version,'5.2') > 0 if versioncmp($midonet_version,'5.2') > 0
{ {
$ins_service_name = 'elasticsearch-es-01' $ins_service_name = 'elasticsearch-instance-es-01'
$config = { 'network.host' => ['_local_',$elk_bind_ip], $config = {
'network.host' => ['_local_',$elk_bind_ip],
'cluster.name' => $elk_cluster_name, 'cluster.name' => $elk_cluster_name,
'discovery.zen.ping.unicast.hosts' => $elk_hosts, 'discovery.zen.ping.unicast.hosts' => $elk_hosts,
'discovery.zen.minimum_master_nodes' => (size($elk_hosts)/2)+1} 'discovery.zen.minimum_master_nodes' => (size($elk_hosts)/2)+1
}
} }
else { else {
@ -156,7 +158,8 @@ class midonet::analytics (
version => $curator_version, version => $curator_version,
} -> } ->
anchor { 'curator-end': } anchor { 'curator-end': }
} elsif $::osfamily == 'RedHat' { }
elsif $::osfamily == 'RedHat' {
anchor { 'curator-begin': } -> anchor { 'curator-begin': } ->
exec { 'rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch': exec { 'rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch':
path => '/usr/bin' path => '/usr/bin'
@ -209,50 +212,42 @@ class midonet::analytics (
else { else {
class { 'midonet::analytics::quickstart': class { 'midonet::analytics::quickstart':
zookeeper_hosts => $zookeeper_hosts, zookeeper_hosts => $zookeeper_hosts,
notify => Service[$real_analytics_package_name] notify => Service['analytics_service']
} }
} }
} }
} }
else { else {
notice('Skipping installation of midonet analytics services') notice('Skipping installation of midonet analytics services')
} }
if $::osfamily == 'Debian' { if $::osfamily == 'Debian' {
file_line { 'Set LS_HEAP_SIZE': $logstash_config_file = '/etc/default/logstash'
path => '/etc/default/logstash', $elasticsearch_config_file = '/etc/default/elasticsearch'
line => "LS_HEAP_SIZE='${heap_size_gb}g'", $logstash_service = 'logstash'
match => '^LS_HEAP_SIZE.*$', $elasticsearch_service = 'elasticsearch'
require => Package['logstash'],
notify => Service['logstash'],
}
file_line { 'Set ES_HEAP_SIZE':
path => '/etc/default/elasticsearch',
line => "ES_HEAP_SIZE='${heap_size_gb}g'",
match => '^ES_HEAP_SIZE.*$',
require => Package['elasticsearch'],
notify => Service[$ins_service_name],
}
} }
if $::osfamily == 'RedHat' { if $::osfamily == 'RedHat' {
$logstash_config_file = '/etc/sysconfig/logstash'
$elasticsearch_config_file = '/etc/sysconfig/elasticsearch'
$logstash_service = 'logstash'
$elasticsearch_service = 'elasticsearch'
}
file_line { 'Set LS_HEAP_SIZE': file_line { 'Set LS_HEAP_SIZE':
path => '/etc/sysconfig/logstash', path => $logstash_config_file,
line => "LS_HEAP_SIZE='${heap_size_gb}g'", line => "LS_HEAP_SIZE='${heap_size_gb}g'",
match => '^LS_HEAP_SIZE.*$', match => '^LS_HEAP_SIZE.*$',
require => Package['logstash'], require => Package['logstash'],
notify => Service['logstash'], notify => Service[$ins_service_name],
} }
file_line { 'Set ES_HEAP_SIZE': file_line { 'Set ES_HEAP_SIZE':
path => '/etc/sysconfig/elasticsearch', path => $elasticsearch_config_file,
line => "ES_HEAP_SIZE='${heap_size_gb}g'", line => "ES_HEAP_SIZE='${heap_size_gb}g'",
match => '^ES_HEAP_SIZE.*$', match => '^ES_HEAP_SIZE.*$',
require => Package['elasticsearch'], require => Package['elasticsearch'],
notify => Service[$ins_service_name], notify => Service[$ins_service_name],
} }
} }
}

52
manifests/analytics/services.pp
View File

@ -51,7 +51,9 @@ class midonet::analytics::services (
$tools_package_name = 'midonet-tools', $tools_package_name = 'midonet-tools',
$elk_package_name = 'midonet-elk', $elk_package_name = 'midonet-elk',
$calliope_port = '8080', $calliope_port = '8080',
$midonet_version = '5.2' $midonet_version = '5.2',
$logstash_service = 'logstash',
$elasticsearch_service = 'elasticsearch',
) { ) {
include ::stdlib include ::stdlib
$real_analytics_package_name = versioncmp($midonet_version,'5.2') ? {'1' => $elk_package_name, default => $analytics_package_name} $real_analytics_package_name = versioncmp($midonet_version,'5.2') ? {'1' => $elk_package_name, default => $analytics_package_name}
@ -66,65 +68,65 @@ class midonet::analytics::services (
if versioncmp($midonet_version,'5.2') > 0 { if versioncmp($midonet_version,'5.2') > 0 {
if $::osfamily == 'Debian' { package { $tools_package_name: ensure => present, }
exec {'update-ca-certificates -f':
path => ['/usr/bin', '/usr/sbin','/bin'],
before => Package[$tools_package_name],
}
}
package { $tools_package_name:
ensure => present,
name => $tools_package_name,
}
package { $real_analytics_package_name: package { $real_analytics_package_name:
ensure => present, ensure => present,
name => $real_analytics_package_name, notify => $analytics_notifications,
} ->
exec { $logstash_command:
path => ['/usr/bin', '/usr/sbin','/sbin'],
require => Package[$real_analytics_package_name],
} }
if $::osfamily == 'RedHat' {
$analytics_notifications = Service['logstash', 'elasticsearch']
}
elsif $::osfamily == 'Debian' {
$analytics_notifications = undef
exec {'update-ca-certificates -f':
path => ['/usr/bin', '/usr/sbin','/bin'],
before => Package['midonet_tools'],
}
exec { $logstash_command:
path => ['/usr/bin', '/usr/sbin','/sbin'],
require => Package['analytics'],
}
exec { 'service elasticsearch-es-01 restart': exec { 'service elasticsearch-es-01 restart':
path => ['/usr/bin', '/usr/sbin',], path => ['/usr/bin', '/usr/sbin',],
require => Package[$real_analytics_package_name], require => Package['analytics'],
}
} }
} }
else { else {
package { $tools_package_name: package { 'midonet_tools':
ensure => present, ensure => present,
name => $tools_package_name, name => $tools_package_name,
} }
package { $real_analytics_package_name: package { 'analytics':
ensure => present, ensure => present,
name => $real_analytics_package_name, name => $real_analytics_package_name,
} -> } ->
exec { $logstash_command: exec { $logstash_command:
path => ['/usr/bin', '/usr/sbin','/sbin'], path => ['/usr/bin', '/usr/sbin','/sbin'],
before => Service[$real_analytics_package_name], before => Service['analytics_service'],
} }
unless $calliope_port == '8080' { unless $calliope_port == '8080' {
exec { "echo calliope.service.ws_port : ${calliope_port} | mn-conf set -t default": exec { "echo calliope.service.ws_port : ${calliope_port} | mn-conf set -t default":
path => ['/usr/bin', '/bin'], path => ['/usr/bin', '/bin'],
before => Service[$real_analytics_package_name], before => Service['analytics_service'],
} }
} }
service { $real_analytics_package_name: service { 'analytics_service':
ensure => 'running', ensure => 'running',
name => $real_analytics_package_name, name => $real_analytics_package_name,
enable => true, enable => true,
require => Package[$real_analytics_package_name], require => Package['analytics'],
} }
} }
} }