Dzahn has submitted this change and it was merged.
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, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
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 0fd6e1f..8e0b25e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1778,7 +1778,6 @@
ensure => 'directory',
}
- include base::firewall
include redis
include redis::ganglia
}
@@ -1788,7 +1787,7 @@
include passwords::redis
include redis
include redis::ganglia
- include base::firewall
+
}
# OTRS evaluation upgrade
--
To view, visit https://gerrit.wikimedia.org/r/245964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb889b1feed47ad53a5fc8fa42bec289564ea957
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
