Dzahn has submitted this change and it was merged. Change subject: network/constants: add maintenance hosts (v4) ......................................................................
network/constants: add maintenance hosts (v4) Add maintenance hosts to network constants so that they can be used in ferm rules like we do with $DEPLOYMENT_HOSTS. For example it would be useful for https://gerrit.wikimedia.org/r/#/c/314772/ <s>I tried something similar but in hiera here https://gerrit.wikimedia.org/r/#/c/302774/</s> Which way is the one to go as of now? <s>The v6 IPs are not added here yet, because there is https://gerrit.wikimedia.org/r/#/c/302649/ if that could be merged too that would be nice.</s> Amended to add mapped IPv6 addresses and labtest hosts. Still needs something for labs, "deployment-terbium" and "deployment-wasat" don't exist yet. Change-Id: I1bd900b033b50aa01c93289fd7c0133d41f483cc --- M modules/network/manifests/constants.pp 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Alexandros Kosiaris: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/network/manifests/constants.pp b/modules/network/manifests/constants.pp index c08e890..35c3b6b 100644 --- a/modules/network/manifests/constants.pp +++ b/modules/network/manifests/constants.pp @@ -58,6 +58,12 @@ '10.192.16.132', # mira.codfw.wmnet '2620:0:860:102:10:192:16:132', # mira.codfw.wmnet ], + 'maintenance_hosts' => [ + '10.64.32.13', # terbium.eqiad.wmnet + '2620:0:861:103:10:64:32:13', # terbium.eqiad.wmnet + '10.192.48.45', # wasat.codfw.wmnet + '2620:0:860:104:10:192:48:45', # wasat.codfw.wmnet + ], 'puppet_frontends' => [ '10.64.16.160', # palladium.eqiad.wmnet '2620:0:861:102:10:64:16:16', # palladium.eqiad.wmnet @@ -93,6 +99,12 @@ '10.192.16.132', # mira.codfw.wmnet '2620:0:860:102:10:192:16:132', # mira.codfw.wmnet ], + 'maintenance_hosts' => [ + '10.64.32.13', # terbium.eqiad.wmnet + '2620:0:861:103:10:64:32:13', # terbium.eqiad.wmnet + '10.192.48.45', # wasat.codfw.wmnet + '2620:0:860:104:10:192:48:45', # wasat.codfw.wmnet + ], }, 'labs' => { 'bastion_hosts' => concat([ @@ -108,6 +120,10 @@ '10.68.21.205', # deployment-tin.deployment-prep.eqiad.wmflabs '10.68.20.135', # deployment-mira.deployment-prep.eqiad.wmflabs ], + 'maintenance_hosts' => [ + '', # deployment-terbium.deployment-prep.eqiad.wmflabs ? + '', # deployment-wasat.deployment-prep.eqiad.wmflabs ? + ], } } -- To view, visit https://gerrit.wikimedia.org/r/314778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1bd900b033b50aa01c93289fd7c0133d41f483cc Gerrit-PatchSet: 9 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Alex Monk <a...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Eevans <eev...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
