Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/399902 )
Change subject: smokeping: convert to profile ...................................................................... smokeping: convert to profile Change-Id: Icdc94d36acd9a051bbfd720fb311dc74d0ba9f9b --- A modules/profile/manifests/smokeping.pp M modules/role/manifests/smokeping.pp 2 files changed, 29 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/399902/1 diff --git a/modules/profile/manifests/smokeping.pp b/modules/profile/manifests/smokeping.pp new file mode 100644 index 0000000..962a23e --- /dev/null +++ b/modules/profile/manifests/smokeping.pp @@ -0,0 +1,28 @@ +# http://oss.oetiker.ch/smokeping/ +class profile::smokeping ( + $active_server = hiera('netmon_server') + $passive_server = hiera('netmon_server_failover') +){ + + class{ '::smokeping': + active_server => $active_server, + } + + class{ '::smokeping::web': } + + rsync::quickdatacopy { 'var-lib-smokeping': + ensure => present, + auto_sync => true, + source_host => $active_server, + dest_host => $passive_server, + module_path => '/var/lib/smokeping', + } + + ferm::service { 'smokeping-http': + proto => 'tcp', + port => '80', + srange => '$CACHE_MISC', + } + + backup::set { 'smokeping': } +} diff --git a/modules/role/manifests/smokeping.pp b/modules/role/manifests/smokeping.pp index f1f12ed..7575b88 100644 --- a/modules/role/manifests/smokeping.pp +++ b/modules/role/manifests/smokeping.pp @@ -3,28 +3,5 @@ system::role { 'smokeping': description => 'smokeping server' } - $active_server = hiera('netmon_server') - $passive_server = hiera('netmon_server_failover') - - rsync::quickdatacopy { 'var-lib-smokeping': - ensure => present, - auto_sync => true, - source_host => $active_server, - dest_host => $passive_server, - module_path => '/var/lib/smokeping', - } - - ferm::service { 'smokeping-http': - proto => 'tcp', - port => '80', - srange => '$CACHE_MISC', - } - - backup::set { 'smokeping': } - - class{ '::smokeping': - active_server => $active_server, - } - - class{ '::smokeping::web': } + include ::profile::smokeping } -- To view, visit https://gerrit.wikimedia.org/r/399902 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icdc94d36acd9a051bbfd720fb311dc74d0ba9f9b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
