Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226104
Change subject: ci: fix ganglia plugins hotlinking
......................................................................
ci: fix ganglia plugins hotlinking
Change-Id: I7bb5644d74f46fbb880c979bf6c55b40cedc8bda
---
M manifests/role/ci.pp
R modules/ganglia/files/plugins/gmond_jenkins.py
R modules/ganglia/templates/plugins/gmond_jenkins.pyconf.erb
3 files changed, 2 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/226104/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index a73c727..0191c09 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -91,24 +91,12 @@
file { '/usr/lib/ganglia/python_modules/jenkins.py':
ensure => absent,
}
- file { '/usr/lib/ganglia/python_modules/gmond_jenkins.py':
- source => 'puppet:///files/ganglia/plugins/jenkins.py',
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['ganglia-monitor'],
- }
file { '/etc/ganglia/conf.d/jenkins.pyconf':
ensure => absent,
}
- file { '/etc/ganglia/conf.d/gmond_jenkins.pyconf':
- source => 'puppet:///files/ganglia/plugins/jenkins.pyconf',
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['ganglia-monitor'],
- }
+
+ ganglia::plugins::python { 'gmond_jenkins': }
# key pair for VE sync tasks (T84731)
file { '/var/lib/jenkins/.ssh/jenkins-mwext-sync_id_rsa':
diff --git a/modules/ganglia/files/plugins/jenkins.py
b/modules/ganglia/files/plugins/gmond_jenkins.py
similarity index 100%
rename from modules/ganglia/files/plugins/jenkins.py
rename to modules/ganglia/files/plugins/gmond_jenkins.py
diff --git a/modules/ganglia/files/plugins/jenkins.pyconf
b/modules/ganglia/templates/plugins/gmond_jenkins.pyconf.erb
similarity index 100%
rename from modules/ganglia/files/plugins/jenkins.pyconf
rename to modules/ganglia/templates/plugins/gmond_jenkins.pyconf.erb
--
To view, visit https://gerrit.wikimedia.org/r/226104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb5644d74f46fbb880c979bf6c55b40cedc8bda
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
