Faidon Liambotis has submitted this change and it was merged.
Change subject: memcached: remove redundant hardy check
......................................................................
memcached: remove redundant hardy check
We have no hardy boxes running memcached, so this file check isn't needed.
Change-Id: I6a2f06b44dcbe9866d7aaef8faed638a7a6e5a6a
---
M manifests/memcached.pp
1 file changed, 1 insertion(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/memcached.pp b/manifests/memcached.pp
index 562e574..64efcf5 100644
--- a/manifests/memcached.pp
+++ b/manifests/memcached.pp
@@ -33,18 +33,9 @@
ensure => absent;
}
- # on lucid, this file comes from the ganglia.pp stuff, which
+ # on lucid, /usr/lib/ganglia/python_modules file comes from the
ganglia.pp stuff, which
# means there's actually a hidden dependency on ganglia.pp for
# the memcache class to work.
- if $::lsbdistcodename == "hardy" {
- file {
- "/usr/lib/ganglia/python_modules":
- owner => root,
- group => root,
- mode => 0755,
- ensure => directory;
- }
- }
file {
"/usr/lib/ganglia/python_modules/memcached.py":
require =>
File["/usr/lib/ganglia/python_modules"],
--
To view, visit https://gerrit.wikimedia.org/r/86997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a2f06b44dcbe9866d7aaef8faed638a7a6e5a6a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <matanya.mo...@gmail.com>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ryan Lane <rl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
