Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/245964
Change subject: Move base:firewall include into the memcached role
......................................................................
Move base:firewall include into the memcached role
Change-Id: Ieb889b1feed47ad53a5fc8fa42bec289564ea957
---
M manifests/role/memcached.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/245964/1
diff --git a/manifests/role/memcached.pp b/manifests/role/memcached.pp
index f694519..365e81e 100644
--- a/manifests/role/memcached.pp
+++ b/manifests/role/memcached.pp
@@ -14,6 +14,7 @@
include standard
include webserver::sysctl_settings
+ include base::firewall
$memcached_size = $::realm ? {
'production' => 89088,
diff --git a/manifests/site.pp b/manifests/site.pp
index 5f660fa..9b272e8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1821,7 +1821,6 @@
ensure => 'directory',
}
- include base::firewall
include redis
include redis::ganglia
}
@@ -1832,7 +1831,6 @@
include redis
include redis::ganglia
include base::debdeploy
- include base::firewall
# lint:ignore:quoted_booleans
salt::grain { 'debdeploy-memcached': value => 'true' }
# lint:endignore
--
To view, visit https://gerrit.wikimedia.org/r/245964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb889b1feed47ad53a5fc8fa42bec289564ea957
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
