Skip to content
Snippets Groups Projects
Commit c7aa89f0 authored by Riccardo Bucchi's avatar Riccardo Bucchi
Browse files

Merge branch 'dev'

parents 3086b2ee 709bca42
No related branches found
Tags 3.2.1
1 merge request!32Bugfix juno puppetfile
## t_hostname => $hostname,ZABBIX
#a zabbix node variables
$zabbix_server_ip = '192.168.0.11'
$zabbix_versione = '2.4'
$zabbix_version = '2.4'
$zabbix_db_pwd = undef
$zabbix_install = true
$zabbix_key = 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4'
$zabbix_key_source = 'http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX'
# NODE DEFINITION
# ===============
......@@ -49,6 +52,8 @@ $rabbit_package_gpg_key = "https://www.rabbitmq.com/rabbitmq-release-signing-key
# class {'iaas::role::monit_agent':
# zabbix_version => $zabbix_version,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#}
......@@ -77,7 +82,10 @@ $rabbit_package_gpg_key = "https://www.rabbitmq.com/rabbitmq-release-signing-key
# if $zabbix_install {
# class {'iaas::role::monit_agent':
# zabbix_version => $zabbix_version,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#}
......@@ -106,7 +114,9 @@ $rabbit_package_gpg_key = "https://www.rabbitmq.com/rabbitmq-release-signing-key
# if $zabbix_install {
# class {'iaas::role::monit_agent':
# zabbix_version => $zabbix_version,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#}
......@@ -145,7 +155,9 @@ $ceph_mon_key = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw=='
# if $zabbix_install {
# class {'iaas::role::monit_agent':
# zabbix_version => $zabbix_version,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#
......@@ -182,7 +194,9 @@ $ceph_mon_key = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw=='
# if $zabbix_install {
# class {'iaas::role::monit_agent':
# zabbix_version => $zabbix_version,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#
......@@ -207,7 +221,9 @@ $ceph_mon_key = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw=='
# if $zabbix_install {
# class {'iaas::role::monit_agent':
# zabbix_version => $zabbix_version,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#}
......@@ -226,7 +242,9 @@ $ceph_mon_key = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw=='
# if $zabbix_install {
# class {'iaas::role::monit_agent':
# zabbix_version => $zabbix_version,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_server_ip => $zabbix_server_ip,
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#
......@@ -237,8 +255,10 @@ $ceph_mon_key = 'AQApksZUIJhXJxAAEHVW/dbL1OeLA7Om++zdVw=='
# include 'iaas::params'
# include 'iaas::role::iaasbase'
# class {'iaas::role::monit_server':
# database_password => undef,
# zabbix_version => $zabbix_version,
# database_password => $zabbix_db_pwd,
# zabbix_version => $zabbix_version
# zabbix_key => $zabbix_key,
# zabbix_key_source => $zabbix_key_source,
# }
# }
#}
......@@ -2,13 +2,21 @@ class iaas::profile::zabbix::agent (
$zabbix_server_ip = undef,
$admin_interface = undef,
$zabbix_version = undef,
$zabbix_key = undef,
$zabbix_key_source = undef,
){
include apt
apt::source { 'zabbix':
location => "http://repo.zabbix.com/zabbix/${zabbix_version}/ubuntu/",
repos => 'main',
key => $zabbix_key,
key_source => $zabbix_key_source,
}->
class { '::zabbix::agent':
server => $zabbix_server_ip,
listenip => getvar("::ipaddress_${admin_interface}"),
serveractive => "${zabbix_server_ip}:10051",
manage_repo => true,
manage_repo => false,
zabbix_version => $zabbix_version,
}
}
......@@ -11,6 +11,8 @@ class iaas::profile::zabbix::server (
$listenip = undef,
$zabbix_version = undef,
$admin_interface = undef,
$zabbix_key = undef,
$zabbix_key_source = undef,
){
include apt
......@@ -34,10 +36,10 @@ class iaas::profile::zabbix::server (
apache::listen { '8140': }
class { 'mysql::client': }
class { 'zabbix::repo':
zabbix_version => $zabbix_version,
manage_repo => true,
manage_repo => false,
}
class { 'zabbix':
......@@ -64,5 +66,8 @@ class iaas::profile::zabbix::server (
class { 'zabbix::agent':
zabbix_server_ip => $zabbix_server_ip,
admin_interface => $admin_interface,
zabbix_version => $zabbix_version,
zabbix_key => $zabbix_key,
zabbix_key_source => $zabbix_key_source,
}
}
class iaas::role::monit_agent(
$zabbix_server_ip = undef,
$admin_interface = $iaas::params::admin_interface,
$zabbix_version = '2.2',
$zabbix_version = '2.4',
$zabbix_key = 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4',
$zabbix_key_source = 'http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX',
) {
class { 'iaas::profile::zabbix::agent':
zabbix_version => $zabbix_version,
zabbix_server_ip => $zabbix_server_ip,
admin_interface => $admin_interface,
zabbix_key => $zabbix_key,
zabbix_key_source => $zabbix_key_source,
}
}
class iaas::role::monit_server(
$database_password = undef,
$admin_interface = $iaas::params::admin_interface,
$zabbix_version = '2.2',
$zabbix_version = '2.4',
$zabbix_key = 'FBABD5FB20255ECAB22EE194D13D58E479EA5ED4',
$zabbix_key_source = 'http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX',
) {
class { 'iaas::profile::zabbix::server':
mysql_bind_address => '127.0.0.1',
......@@ -15,5 +17,7 @@ class iaas::role::monit_server(
zabbix_server_ip => '127.0.0.1',
admin_interface => $admin_interface,
zabbix_version => $zabbix_version,
zabbix_key => $zabbix_key,
zabbix_key_source => $zabbix_key_source,
}
}
......@@ -49,25 +49,25 @@
{"name":"puppetlabs/ntp","version_requirement":"4.1.0"},
{"name":"puppetlabs/stdlib","version_requirement":"4.8.0"},
{"name":"stackforge/vswitch","version_requirement":"1.1.0"},
{"name":"duritong/sysctl"},
{"name":"duritong/sysctl","version_requirement":"0.0.11"},
{"name":"puppetlabs/rabbitmq","version_requirement":"3.1.0"},
{"name":"puppetlabs/xinetd"},
{"name":"puppetlabs/xinetd","version_requirement":"1.5.0"},
{"name":"garethr/erlang","version_requirement":"0.2.0"},
{"name":"adrien/boolean","version_requirement":"1.0.1"},
{"name":"adrien/filemapper","version_requirement":"1.1.3"},
{"name":"adrien/network","version_requirement":"0.4.2"},
{"name":"aimonb/aviator","version_requirement":"0.5.1"},
{"name":"saz/resolv_conf"},
{"name":"saz/locales"},
{"name":"saz/timezone"},
{"name":"arioch/keepalived"},
{"name":"richardc/datacat"},
{"name":"deric/zookeeper"},
{"name":"camptocamp/kmod"},
{"name":"puppetlabs/haproxy"},
{"name":"saz/resolv_conf","version_requirement":"3.0.5"},
{"name":"saz/locales","version_requirement":"2.2.2"},
{"name":"saz/timezone","version_requirement":"3.3.0"},
{"name":"arioch/keepalived","version_requirement":"1.2.3"},
{"name":"richardc/datacat","version_requirement":"0.6.2"},
{"name":"deric/zookeeper","version_requirement":"0.4.2"},
{"name":"camptocamp/kmod","version_requirement":"2.1.0"},
{"name":"puppetlabs/haproxy","version_requirement":"1.4.0"},
{"name":"puppetlabs/postgresql","version_requirement":"4.0.0"},
{"name":"puppetlabs/pe_gem"},
{"name":"puppetlabs/ruby"},
{"name":"theforeman/puppet"}
{"name":"puppetlabs/pe_gem","version_requirement":"0.2.0"},
{"name":"puppetlabs/ruby","version_requirement":"0.4.0"},
{"name":"theforeman/puppet","version_requirement":"4.2.0"}
]
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment