Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/245968
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, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/68/245968/1 diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp index 7f45a1a..172ba51 100644 --- a/manifests/role/grafana.pp +++ b/manifests/role/grafana.pp @@ -4,6 +4,9 @@ # editor for Graphite & InfluxDB. It powers <https://grafana.wikimedia.org>. # class role::grafana { + + include base::firewall + $domain_suffix = $::realm ? { production => 'wikimedia.org', labs => 'wmflabs.org', 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 5f660fa..ee41339 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1215,7 +1215,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: newchange Gerrit-Change-Id: Ieb858b6f3c868753867aed64138d06515be77988 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
