[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add mw13[29-37] to site.pp and conftool
Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397749 ) Change subject: Add mw13[29-37] to site.pp and conftool .. Add mw13[29-37] to site.pp and conftool mw1329->1333 will become ROW C appservers. mw1334->1337 will become ROW C jobrunners. Bug: T165519 Change-Id: Id9539e819a46c3b7d22573384f361a8f1fea4188 --- M conftool-data/node/eqiad.yaml M manifests/site.pp 2 files changed, 17 insertions(+), 1 deletion(-) Approvals: Giuseppe Lavagetto: Looks good to me, but someone else must approve Muehlenhoff: Looks good to me, but someone else must approve Elukey: Verified; Looks good to me, approved diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml index 1fc4675..9357ded 100644 --- a/conftool-data/node/eqiad.yaml +++ b/conftool-data/node/eqiad.yaml @@ -20,6 +20,10 @@ mw1309.eqiad.wmnet: [apache2,nginx] mw1310.eqiad.wmnet: [apache2,nginx] mw1311.eqiad.wmnet: [apache2,nginx] +mw1334.eqiad.wmnet: [apache2,nginx] +mw1335.eqiad.wmnet: [apache2,nginx] +mw1336.eqiad.wmnet: [apache2,nginx] +mw1337.eqiad.wmnet: [apache2,nginx] api_appserver: mw1189.eqiad.wmnet: [apache2,nginx] mw1190.eqiad.wmnet: [apache2,nginx] @@ -143,6 +147,11 @@ mw1326.eqiad.wmnet: [apache2,nginx] mw1327.eqiad.wmnet: [apache2,nginx] mw1328.eqiad.wmnet: [apache2,nginx] +mw1329.eqiad.wmnet: [apache2,nginx] +mw1330.eqiad.wmnet: [apache2,nginx] +mw1331.eqiad.wmnet: [apache2,nginx] +mw1332.eqiad.wmnet: [apache2,nginx] +mw1333.eqiad.wmnet: [apache2,nginx] cache_text: cp1052.eqiad.wmnet: [varnish-fe, varnish-be, nginx] cp1053.eqiad.wmnet: [varnish-fe, varnish-be, nginx] diff --git a/manifests/site.pp b/manifests/site.pp index 21a6eb4..c6cb9e9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1641,9 +1641,16 @@ include ::base::firewall } +# ROW C eqiad jobrunners +node /^mw133[4-7]\.eqiad\.wmnet$/ { +role(mediawiki::jobrunner) +include ::base::firewall +} + + # T165519 # ROW C eqiad appservers -node /^mw13(19|2[0-8])\.eqiad\.wmnet$/ { +node /^mw13(19|2[0-9]|3[0-3])\.eqiad\.wmnet$/ { role(mediawiki::appserver) } -- To view, visit https://gerrit.wikimedia.org/r/397749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9539e819a46c3b7d22573384f361a8f1fea4188 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ElukeyGerrit-Reviewer: Elukey Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Muehlenhoff Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add mw13[29-37] to site.pp and conftool
Elukey has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/397749 ) Change subject: Add mw13[29-37] to site.pp and conftool .. Add mw13[29-37] to site.pp and conftool mw1329->1333 will become ROW C appservers. mw1333->1337 will become ROW C jobrunners. Bug: T165519 Change-Id: Id9539e819a46c3b7d22573384f361a8f1fea4188 --- M conftool-data/node/eqiad.yaml M manifests/site.pp 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/397749/1 diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml index 83e79e6..2dc45ad 100644 --- a/conftool-data/node/eqiad.yaml +++ b/conftool-data/node/eqiad.yaml @@ -20,6 +20,10 @@ mw1309.eqiad.wmnet: [apache2,nginx] mw1310.eqiad.wmnet: [apache2,nginx] mw1311.eqiad.wmnet: [apache2,nginx] +mw1334.eqiad.wmnet: [apache2,nginx] +mw1335.eqiad.wmnet: [apache2,nginx] +mw1336.eqiad.wmnet: [apache2,nginx] +mw1337.eqiad.wmnet: [apache2,nginx] api_appserver: mw1189.eqiad.wmnet: [apache2,nginx] mw1190.eqiad.wmnet: [apache2,nginx] @@ -143,6 +147,11 @@ mw1326.eqiad.wmnet: [apache2,nginx] mw1327.eqiad.wmnet: [apache2,nginx] mw1328.eqiad.wmnet: [apache2,nginx] +mw1329.eqiad.wmnet: [apache2,nginx] +mw1330.eqiad.wmnet: [apache2,nginx] +mw1331.eqiad.wmnet: [apache2,nginx] +mw1332.eqiad.wmnet: [apache2,nginx] +mw1333.eqiad.wmnet: [apache2,nginx] cache_text: cp1052.eqiad.wmnet: [varnish-fe, varnish-be, nginx] cp1053.eqiad.wmnet: [varnish-fe, varnish-be, nginx] diff --git a/manifests/site.pp b/manifests/site.pp index 10d8be1..9ab0fc1 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1678,9 +1678,16 @@ include ::base::firewall } +# ROW C eqiad jobrunners +node /^mw133[4-7])\.eqiad\.wmnet$/ { +role(mediawiki::jobrunner) +include ::base::firewall +} + + # T165519 # ROW C eqiad appservers -node /^mw13(19|2[0-8])\.eqiad\.wmnet$/ { +node /^mw13(19|2[0-9]|3[0-3])\.eqiad\.wmnet$/ { role(mediawiki::appserver) include ::base::firewall } -- To view, visit https://gerrit.wikimedia.org/r/397749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9539e819a46c3b7d22573384f361a8f1fea4188 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits