Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Include the zotero role in the sca role
......................................................................
Include the zotero role in the sca role
Thus assigning zotero to run on the SCA (Service Cluster A) cluster
Update the realserver ips for the role as well.
Bug: T89869
Change-Id: Ie7adfc80ec6f6553bd0cdcbc83b3122642b470b4
---
A hieradata/common/zotero.yaml
M hieradata/role/common/sca.yaml
M manifests/role/sca.pp
3 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/zotero.yaml b/hieradata/common/zotero.yaml
new file mode 100644
index 0000000..584337a
--- /dev/null
+++ b/hieradata/common/zotero.yaml
@@ -0,0 +1 @@
+http_proxy: url-downloader.wikimedia.org:8080
diff --git a/hieradata/role/common/sca.yaml b/hieradata/role/common/sca.yaml
index 18406ef..8ac5efb 100644
--- a/hieradata/role/common/sca.yaml
+++ b/hieradata/role/common/sca.yaml
@@ -8,6 +8,7 @@
- cxserver-admin
lvs::realserver::realserver_ips:
+ - '10.2.2.16' # zotero.svc.eqiad.wmnet
- '10.2.2.18' # cxserver.svc.eqiad.wmnet
- '10.2.2.19' # citoid.svc.eqiad.wmnet
- '10.2.2.20' # mathoid.svc.eqiad.wmnet
diff --git a/manifests/role/sca.pp b/manifests/role/sca.pp
index 7d71f67..a4ae5e1 100644
--- a/manifests/role/sca.pp
+++ b/manifests/role/sca.pp
@@ -1,6 +1,7 @@
-# "Compendium" class for nodes supporting various parsoid services
+# "Compendium" class for nodes supporting various *oid services
+# This class is an intermediate step to better design
class role::sca {
- include role::apertium, role::citoid, role::cxserver, role::mathoid
+ include role::apertium, role::citoid, role::cxserver, role::mathoid,
role::zotero
include standard
include admin
include lvs::realserver
--
To view, visit https://gerrit.wikimedia.org/r/195041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7adfc80ec6f6553bd0cdcbc83b3122642b470b4
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
