Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397725 )
Change subject: mariadb::tendril: move firewall to role, use profile
......................................................................
mariadb::tendril: move firewall to role, use profile
Change-Id: I9dd2d43b3f9cc374e4fabe06face8fd9252bd558
---
M manifests/site.pp
M modules/role/manifests/mariadb/tendril.pp
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/397725/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 10d8be1..437ace0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -616,7 +616,6 @@
# tendril db
node 'db1011.eqiad.wmnet' {
role(mariadb::tendril)
- include ::base::firewall
}
node 'dbstore1001.eqiad.wmnet' {
diff --git a/modules/role/manifests/mariadb/tendril.pp
b/modules/role/manifests/mariadb/tendril.pp
index 84f9b79..1ad8801 100644
--- a/modules/role/manifests/mariadb/tendril.pp
+++ b/modules/role/manifests/mariadb/tendril.pp
@@ -5,6 +5,8 @@
description => 'tendril database server',
}
+ include ::profile::base::firewall
+
include mariadb::packages_wmf
include mariadb::service
--
To view, visit https://gerrit.wikimedia.org/r/397725
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dd2d43b3f9cc374e4fabe06face8fd9252bd558
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
