Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/245958

Change subject: Include base::firewall in the mariadb::labsdb role
......................................................................

Include base::firewall in the mariadb::labsdb role

Change-Id: I134491e38a091356c7c87dc3eb4637c7c6da803c
---
M manifests/role/mariadb.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/245958/1

diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index e1b86ec..a6187a2 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -548,6 +548,7 @@
     include role::mariadb::monitor
     include passwords::misc::scripts
     include role::mariadb::ferm
+    include base::firewall
 
     class { 'mariadb::packages_wmf':
         mariadb10 => true,
diff --git a/manifests/site.pp b/manifests/site.pp
index 5f660fa..0b77fa9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1324,19 +1324,16 @@
 node 'labsdb1001.eqiad.wmnet' {
     # this role is depecated and should be converted to labs::db::slave
     include role::mariadb::labs
-    include base::firewall
 }
 
 node 'labsdb1002.eqiad.wmnet' {
     # this role is depecated and should be converted to labs::db::slave
     include role::mariadb::labs
-    include base::firewall
 }
 
 node 'labsdb1003.eqiad.wmnet' {
     # this role is depecated and should be converted to labs::db::slave
     include role::mariadb::labs
-    include base::firewall
 }
 
 node 'labsdb1004.eqiad.wmnet' {

-- 
To view, visit https://gerrit.wikimedia.org/r/245958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I134491e38a091356c7c87dc3eb4637c7c6da803c
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

Reply via email to