Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270908
Change subject: cxserver: deploy on SCB
......................................................................
cxserver: deploy on SCB
cxserver needs to be deployed on scb as well, add entries in conftool
and apply the cxserver role on scb
Change-Id: I855a3617e8727b05e65c0590065588d9340c895d
---
M conftool-data/nodes/eqiad.yaml
M conftool-data/services/services.yaml
M hieradata/role/common/scb.yaml
M manifests/role/scb.pp
4 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/270908/1
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index df79489..cac3277 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -254,8 +254,8 @@
sca1001.eqiad.wmnet: [cxserver, zotero]
sca1002.eqiad.wmnet: [cxserver, zotero]
scb:
- scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid]
- scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid]
+ scb1001.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, cxserver]
+ scb1002.eqiad.wmnet: [mobileapps, mathoid, graphoid, citoid, cxserver]
dns:
chromium.wikimedia.org: [pdns_recursor]
hydrogen.wikimedia.org: [pdns_recursor]
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index 104414e..5823c4e 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -92,6 +92,13 @@
weight: 10
datacenters:
- eqiad
+ cxserver:
+ port: 8080
+ default_values:
+ pooled: 'no'
+ weight: 10
+ datacenters:
+ - eqiad
restbase:
restbase:
port: 7231
diff --git a/hieradata/role/common/scb.yaml b/hieradata/role/common/scb.yaml
index 8e65455..932e6d2 100644
--- a/hieradata/role/common/scb.yaml
+++ b/hieradata/role/common/scb.yaml
@@ -12,6 +12,7 @@
lvs::realserver::realserver_ips:
- 10.2.2.14 # mobileapps.svc.eqiad.wmnet
- 10.2.2.15 # graphoid.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
service::configuration::http_proxy: http://url-downloader.wikimedia.org:8080
diff --git a/manifests/role/scb.pp b/manifests/role/scb.pp
index 69e1660..9414bf9 100644
--- a/manifests/role/scb.pp
+++ b/manifests/role/scb.pp
@@ -5,6 +5,7 @@
include role::mathoid
include role::graphoid
include role::citoid
+ include role::cxserver
include standard
include base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/270908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I855a3617e8727b05e65c0590065588d9340c895d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
