Muehlenhoff has submitted this change and it was merged.
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(-)
Approvals:
Jcrespo: Looks good to me, but someone else must approve
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index 3371b6c..5d77d1c 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -550,6 +550,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 edeb3e8..809ee10 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1292,19 +1292,16 @@
node 'labsdb1001.eqiad.wmnet' {
# this role is depecated and should be converted to labs::db::slave
role mariadb::labs
- include base::firewall
}
node 'labsdb1002.eqiad.wmnet' {
# this role is depecated and should be converted to labs::db::slave
role mariadb::labs
- include base::firewall
}
node 'labsdb1003.eqiad.wmnet' {
# this role is depecated and should be converted to labs::db::slave
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: merged
Gerrit-Change-Id: I134491e38a091356c7c87dc3eb4637c7c6da803c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Jcrespo <[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
