Muehlenhoff has submitted this change and it was merged.

Change subject: beta: import scap_masters list from wikitech
......................................................................


beta: import scap_masters list from wikitech

Duplicate information between puppet.git and Wikitech is crazy. Import
the scap::dsh::scap_masters hiera key in puppet.

Source:
https://wikitech.wikimedia.org/wiki/Hiera:Deployment-prep

Change-Id: Ib6c5149888149576d2204c30b683a5d042f19cc6
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 08139d6..ad1ee64 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -163,6 +163,11 @@
 "zotero::http_proxy": 
deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
 "trebuchet::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs
 "scap::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs
+
+scap::dsh::scap_masters:
+    - deployment-tin.deployment-prep.eqiad.wmflabs
+    - mira.deployment-prep.eqiad.wmflabs
+    - mira02.deployment-prep.eqiad.wmflabs
 scap::dsh::groups:
     mediawiki-installation:
         hosts:

-- 
To view, visit https://gerrit.wikimedia.org/r/310827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6c5149888149576d2204c30b683a5d042f19cc6
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to