Muehlenhoff has submitted this change and it was merged.
Change subject: Move base::firewall includes for roles on krypton
......................................................................
Move base::firewall includes for roles on krypton
Change-Id: Ieb858b6f3c868753867aed64138d06515be77988
---
M manifests/role/grafana.pp
M manifests/role/iegreview.pp
M manifests/role/wikimania_scholarships.pp
M manifests/site.pp
4 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
index 5cf66ea..fb5c041 100644
--- a/manifests/role/grafana.pp
+++ b/manifests/role/grafana.pp
@@ -15,6 +15,8 @@
include ::passwords::grafana
include ::passwords::ldap::production
+ include base::firewall
+
class { '::grafana':
config => {
# Configuration settings for /etc/grafana/grafana.ini.
diff --git a/manifests/role/iegreview.pp b/manifests/role/iegreview.pp
index 0f4245a..1eda946 100644
--- a/manifests/role/iegreview.pp
+++ b/manifests/role/iegreview.pp
@@ -4,6 +4,8 @@
#
class role::iegreview {
+ include base::firewall
+
class { '::iegreview':
hostname => 'iegreview.wikimedia.org',
deploy_dir => '/srv/deployment/iegreview/iegreview',
diff --git a/manifests/role/wikimania_scholarships.pp
b/manifests/role/wikimania_scholarships.pp
index 07754b4..735a3c2 100644
--- a/manifests/role/wikimania_scholarships.pp
+++ b/manifests/role/wikimania_scholarships.pp
@@ -4,6 +4,8 @@
#
class role::wikimania_scholarships {
+ include base::firewall
+
class { '::wikimania_scholarships':
hostname => 'scholarships.wikimedia.org',
deploy_dir => '/srv/deployment/scholarships/scholarships',
diff --git a/manifests/site.pp b/manifests/site.pp
index 9d17ab5..4c173c9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1209,7 +1209,6 @@
# virtual machine for misc. PHP apps
node 'krypton.eqiad.wmnet' {
include standard
- include base::firewall
include role::wikimania_scholarships
include role::iegreview
include role::grafana
--
To view, visit https://gerrit.wikimedia.org/r/245968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb858b6f3c868753867aed64138d06515be77988
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[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
