Filippo Giunchedi has submitted this change and it was merged. Change subject: scap: make deployment aware of canary machines ......................................................................
scap: make deployment aware of canary machines Scap is currently unable to differentiate between canary machines, app machines, and api machines. This is a simple step towards basic canary deploys for MediaWiki. Bug: T110068 Change-Id: I223e7a6ea545bc67978aae6adc0122e8c9c63b1f --- A modules/scap/files/dsh/group/mediawiki-api-canaries A modules/scap/files/dsh/group/mediawiki-appserver-canaries M modules/scap/templates/scap.cfg.erb 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Giuseppe Lavagetto: Looks good to me, but someone else must approve 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/scap/files/dsh/group/mediawiki-api-canaries b/modules/scap/files/dsh/group/mediawiki-api-canaries new file mode 100644 index 0000000..4b2f309 --- /dev/null +++ b/modules/scap/files/dsh/group/mediawiki-api-canaries @@ -0,0 +1,14 @@ +# mw1114-mw1120 are canary api appservers +mw1114.eqiad.wmnet +mw1115.eqiad.wmnet +mw1116.eqiad.wmnet +mw1117.eqiad.wmnet +mw1118.eqiad.wmnet +mw1119.eqiad.wmnet +mw1120.eqiad.wmnet + +# mw1276-mw1279 have role mediawiki::appserver::canary_api +mw1276.eqiad.wmnet +mw1277.eqiad.wmnet +mw1278.eqiad.wmnet +mw1279.eqiad.wmnet diff --git a/modules/scap/files/dsh/group/mediawiki-appserver-canaries b/modules/scap/files/dsh/group/mediawiki-appserver-canaries new file mode 100644 index 0000000..80d5111 --- /dev/null +++ b/modules/scap/files/dsh/group/mediawiki-appserver-canaries @@ -0,0 +1,17 @@ +# mw1017-mw1025 are canary appservers +mw1017.eqiad.wmnet +mw1018.eqiad.wmnet +mw1019.eqiad.wmnet +mw1020.eqiad.wmnet +mw1021.eqiad.wmnet +mw1022.eqiad.wmnet +mw1023.eqiad.wmnet +mw1024.eqiad.wmnet +mw1025.eqiad.wmnet + +# mw1261-mw1265 have role mediawiki::canary_appserver +mw1261.eqiad.wmnet +mw1262.eqiad.wmnet +mw1263.eqiad.wmnet +mw1264.eqiad.wmnet +mw1265.eqiad.wmnet diff --git a/modules/scap/templates/scap.cfg.erb b/modules/scap/templates/scap.cfg.erb index f95292d..00699e2 100644 --- a/modules/scap/templates/scap.cfg.erb +++ b/modules/scap/templates/scap.cfg.erb @@ -49,6 +49,10 @@ dsh_proxies: scap-proxies # DSH group naming hosts to use as scap targets dsh_targets: mediawiki-installation +# DSH group naming hosts to use as mediawiki api canaries +dsh_api_canaries: mediawiki-api-canaries +# DSH group naming hosts to use as mediawiki app canaries +dsh_app_canaries: mediawiki-appserver-canaries [eqiad.wmnet] # Wikimedia Foundation production eqiad datacenter -- To view, visit https://gerrit.wikimedia.org/r/294742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I223e7a6ea545bc67978aae6adc0122e8c9c63b1f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani <[email protected]> Gerrit-Reviewer: 20after4 <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Thcipriani <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
