Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172474
Change subject: Move ganglia memcache.py to gmond_memcached.py
......................................................................
Move ganglia memcache.py to gmond_memcached.py
This should prevent naming collisions with python-memcached.
Change-Id: I35c87cdb39979498f0a9da4fa264b6a30268b578
---
R modules/memcached/files/ganglia/gmond_memcached.py
R modules/memcached/files/ganglia/gmond_memcached.pyconf
M modules/memcached/manifests/ganglia.pp
3 files changed, 11 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/74/172474/1
diff --git a/modules/memcached/files/ganglia/memcached.py
b/modules/memcached/files/ganglia/gmond_memcached.py
similarity index 100%
rename from modules/memcached/files/ganglia/memcached.py
rename to modules/memcached/files/ganglia/gmond_memcached.py
diff --git a/modules/memcached/files/ganglia/memcached.pyconf
b/modules/memcached/files/ganglia/gmond_memcached.pyconf
similarity index 98%
rename from modules/memcached/files/ganglia/memcached.pyconf
rename to modules/memcached/files/ganglia/gmond_memcached.pyconf
index ed1f557..c915c13 100644
--- a/modules/memcached/files/ganglia/memcached.pyconf
+++ b/modules/memcached/files/ganglia/gmond_memcached.pyconf
@@ -1,6 +1,6 @@
modules {
module {
- name = "memcached"
+ name = "gmond_memcached"
language = "python"
param host {
diff --git a/modules/memcached/manifests/ganglia.pp
b/modules/memcached/manifests/ganglia.pp
index 4d0586a..8fcc55a 100644
--- a/modules/memcached/manifests/ganglia.pp
+++ b/modules/memcached/manifests/ganglia.pp
@@ -10,19 +10,25 @@
# means there's actually a hidden dependency on ganglia.pp for
# the memcache class to work.
file { '/usr/lib/ganglia/python_modules/memcached.py':
+ ensure => absent,
+ }
+ file { '/usr/lib/ganglia/python_modules/gmond_memcached.py':
owner => 'root',
group => 'root',
mode => '0444',
- source => "puppet:///modules/${module_name}/ganglia/memcached.py",
+ source =>
"puppet:///modules/${module_name}/ganglia/gmond_memcached.py",
require => File['/usr/lib/ganglia/python_modules'],
notify => Service['gmond'],
}
- file { '/etc/ganglia/conf.d/memcached.pyconf':
+ file { '/usr/lib/ganglia/python_modules/memcached.pyconf':
+ ensure => absent,
+ }
+ file { '/etc/ganglia/conf.d/gmond_memcached.pyconf':
owner => 'root',
group => 'root',
mode => '0444',
- source => "puppet:///modules/${module_name}/ganglia/memcached.pyconf",
- require => File['/usr/lib/ganglia/python_modules/memcached.py'],
+ source =>
"puppet:///modules/${module_name}/ganglia/gmond_memcached.pyconf",
+ require => File['/usr/lib/ganglia/python_modules/gmond_memcached.py'],
notify => Service['gmond'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/172474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35c87cdb39979498f0a9da4fa264b6a30268b578
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
