Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174730
Change subject: mediawiki: add node-level definitions for new appservers
......................................................................
mediawiki: add node-level definitions for new appservers
Change-Id: I54390a6a17e63d486d801b562349b9c821d330d7
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M hieradata/regex.yaml
M manifests/site.pp
2 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/174730/1
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index beb31d5..1a3a5c8 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -51,7 +51,21 @@
mainrole: appserver
admin::groups:
- deployment
+
+#mw1221-mw1235 are api apaches (trusty)
+api_3:
+ __regex: !ruby/regexp /^mw12(2[1-9]|3[0-5])\.eqiad\.wmnet$/
+ mainrole: api_appserver
+ admin::groups:
+ - deployment
+appservers_5:
+ __regex: !ruby/regexp /^mw12(3[6-9]|4[0-9]|5[0-8])\.eqiad\.wmnet$/
+ mainrole: appserver
+ admin::groups:
+ - deployment
+
+
swift_fe_eqiad:
__regex: !ruby/regexp /^ms-fe100[1-4]\.eqiad\.wmnet$/
cluster: swift
diff --git a/manifests/site.pp b/manifests/site.pp
index fb313fb..e9ff70b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2055,6 +2055,15 @@
$cluster = 'appserver'
include role::mediawiki::appserver
}
+#mw1221-mw1235 are api apaches (trusty)
+node /^mw12(2[1-9]|3[0-5])\.eqiad\.wmnet$/ {
+ include role::mediawiki::appserver::api
+}
+
+#mw1236-mw1258 are apaches (trusty)
+node /^mw12(3[6-9]|4[0-9]|5[0-8])\.eqiad\.wmnet$/ {
+ include role::mediawiki::appserver
+}
node 'neon.wikimedia.org' {
class { 'base::firewall': }
--
To view, visit https://gerrit.wikimedia.org/r/174730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54390a6a17e63d486d801b562349b9c821d330d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
