Ottomata has submitted this change and it was merged. Change subject: Revert "Puppetization for statsv args added in https://gerrit.wikimedia.org/r/#/c/321911/"; ......................................................................
Revert "Puppetization for statsv args added in https://gerrit.wikimedia.org/r/#/c/321911/"; This reverts commit 6a05d7a2eb88d5ef274177c9c6f33bcf3db41ab6. Change-Id: I643d6598915a5f86b836d931a08e60c9ae1dd4d7 --- M modules/mariadb R modules/webperf/files/statsv.service M modules/webperf/manifests/statsv.pp 3 files changed, 8 insertions(+), 13 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/modules/mariadb b/modules/mariadb index 4d96e95..057540d 160000 --- a/modules/mariadb +++ b/modules/mariadb @@ -1 +1 @@ -Subproject commit 4d96e95500cfbceb8fa552e503644d387e56e334 +Subproject commit 057540db856000b8904ce7d30b4e59535c4ea019 diff --git a/modules/webperf/templates/statsv.service.erb b/modules/webperf/files/statsv.service similarity index 80% rename from modules/webperf/templates/statsv.service.erb rename to modules/webperf/files/statsv.service index 617f79f..20300e0 100644 --- a/modules/webperf/templates/statsv.service.erb +++ b/modules/webperf/files/statsv.service @@ -4,7 +4,7 @@ [Service] WorkingDirectory=/srv/deployment/statsv/statsv -ExecStart=/usr/bin/python /srv/deployment/statsv/statsv/statsv.py --brokers <%= @kafka_brokers %> --statsd <%= @statsd %> +ExecStart=/usr/bin/python /srv/deployment/statsv/statsv/statsv.py User=nobody Restart=always WatchdogSec=5 diff --git a/modules/webperf/manifests/statsv.pp b/modules/webperf/manifests/statsv.pp index 5f49f95..1a09bff 100644 --- a/modules/webperf/manifests/statsv.pp +++ b/modules/webperf/manifests/statsv.pp @@ -5,12 +5,7 @@ class webperf::statsv { include ::webperf - require_package('python-kafka') - - # These are rendered in statsv.service - $kafka_config = kafka_config('analytics') - $kafka_brokers = $kafka_config['brokers']['string'] - $statsd = hiera('statsd') + require_package('python-pykafka') package { 'statsv': ensure => present, @@ -18,14 +13,14 @@ } file { '/lib/systemd/system/statsv.service': - ensure => 'present', - content => template('webperf/statsv.service.erb'), + ensure => present, + source => 'puppet:///modules/webperf/statsv.service', require => Package['statsv'], + notify => Service['statsv'], } service { 'statsv': - ensure => 'running', - provider => 'systemd', - subscribe => File['/lib/systemd/system/statsv.service'], + ensure => running, + provider => 'systemd', } } -- To view, visit https://gerrit.wikimedia.org/r/322662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I643d6598915a5f86b836d931a08e60c9ae1dd4d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
