x/puppet-midonet
Code Issues Proposed changes

Make analytics repositories truly manageable

Browse Source 
Change-Id: Iaa96f309dfafd38591a8dfff954d2047cbbebc6c
(cherry picked from commit 4a2264736d51f6612ad04a9c1a2e912196e492c6)
This commit is contained in:
Alejandro Andreu 2017-03-22 18:34:23 +01:00
parent a2ca587abb
commit f40e475106
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/analytics.pp
View File

@ -15,10 +15,6 @@
# If using MEM Enterprise , set to true # If using MEM Enterprise , set to true
# Default: undef # Default: undef
# #
# [*manage_repo*]
# Should manage midonet repositories?
# Default: undef
#
# [*mem_username*] # [*mem_username*]
# If manage_repo is true and is_mem then specify the username to access the packages # If manage_repo is true and is_mem then specify the username to access the packages
# Default: undef # Default: undef
@ -133,7 +129,7 @@ class midonet::analytics (
} }
class { 'elasticsearch': class { 'elasticsearch':
manage_repo => true, manage_repo => $manage_repo,
repo_version => $elastic_version, repo_version => $elastic_version,
config => $config, config => $config,
require => Class['::logstash'] require => Class['::logstash']
@ -141,13 +137,11 @@ class midonet::analytics (
contain elasticsearch contain elasticsearch
class { 'logstash': class { 'logstash':
manage_repo => true, manage_repo => $manage_repo,
repo_version => $logstash_version, repo_version => $logstash_version,
} }
contain logstash contain logstash
elasticsearch::instance { 'es-01': elasticsearch::instance { 'es-01':
require => Class['::logstash','::elasticsearch'] require => Class['::logstash','::elasticsearch']
} }
@ -160,17 +154,20 @@ class midonet::analytics (
anchor { 'curator-end': } anchor { 'curator-end': }
} }
elsif $::osfamily == 'RedHat' { elsif $::osfamily == 'RedHat' {
if $manage_repo {
exec { 'rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch':
path => '/usr/bin'
} ->
yumrepo { 'curator-3':
descr => 'CentOS/RHEL repository for Elasticsearch Curator 3 packages',
baseurl => 'http://packages.elastic.co/curator/3/centos/$releasever',
gpgcheck => true,
gpgkey => 'http://packages.elastic.co/GPG-KEY-elasticsearch',
enabled => true,
before => Package['python-elasticsearch-curator'],
}
}
anchor { 'curator-begin': } -> anchor { 'curator-begin': } ->
exec { 'rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch':
path => '/usr/bin'
} ->
yumrepo { 'curator-3':
descr => 'CentOS/RHEL repository for Elasticsearch Curator 3 packages',
baseurl => 'http://packages.elastic.co/curator/3/centos/$releasever',
gpgcheck => true,
gpgkey => 'http://packages.elastic.co/GPG-KEY-elasticsearch',
enabled => true,
} ->
package { 'python-elasticsearch-curator': ensure => installed } -> package { 'python-elasticsearch-curator': ensure => installed } ->
anchor { 'curator-end': } anchor { 'curator-end': }
} }
@ -186,8 +183,10 @@ class midonet::analytics (
mem_version => undef, mem_version => undef,
mem_username => $mem_username, mem_username => $mem_username,
mem_password => $mem_password, mem_password => $mem_password,
before => Class['midonet::analytics::services', before => Class[
'midonet::analytics::quickstart'] 'midonet::analytics::services',
'midonet::analytics::quickstart'
]
} }
} }
} }