Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: zotero: simplify url-downloader url lookup in hiera
......................................................................
zotero: simplify url-downloader url lookup in hiera
Bug: T125065
Change-Id: I7545034a90a9ce732d8cac141a1410b27b6cd048
---
M hieradata/role/codfw/sca.yaml
M hieradata/role/common/sca.yaml
M hieradata/role/eqiad/sca.yaml
3 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/sca.yaml b/hieradata/role/codfw/sca.yaml
index 2ad2e12..754c2aa 100644
--- a/hieradata/role/codfw/sca.yaml
+++ b/hieradata/role/codfw/sca.yaml
@@ -1,4 +1,4 @@
lvs::realserver::realserver_ips:
- '10.2.1.11' # apertium.svc.codfw.wmnet
- '10.2.1.16' # zotero.svc.codfw.wmnet
-zotero::http_proxy: url-downloader.codfw.wikimedia.org:8080
+
diff --git a/hieradata/role/common/sca.yaml b/hieradata/role/common/sca.yaml
index 8fc0754..a6713e6 100644
--- a/hieradata/role/common/sca.yaml
+++ b/hieradata/role/common/sca.yaml
@@ -7,3 +7,4 @@
debdeploy::grains:
debdeploy-sca:
value: standard
+zotero::http_proxy: "url-downloader.%{::site}.wikimedia.org:8080"
diff --git a/hieradata/role/eqiad/sca.yaml b/hieradata/role/eqiad/sca.yaml
index 1729deb..6512107 100644
--- a/hieradata/role/eqiad/sca.yaml
+++ b/hieradata/role/eqiad/sca.yaml
@@ -1,4 +1,4 @@
lvs::realserver::realserver_ips:
- '10.2.2.11' # apertium.svc.eqiad.wmnet
- '10.2.2.16' # zotero.svc.eqiad.wmnet
-zotero::http_proxy: url-downloader.eqiad.wikimedia.org:8080
+
--
To view, visit https://gerrit.wikimedia.org/r/277749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7545034a90a9ce732d8cac141a1410b27b6cd048
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
