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