Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401784 )
Change subject: RESTBase: Set up RESTBase for the production_ng role as well
......................................................................
RESTBase: Set up RESTBase for the production_ng role as well
During the migration from Cassandra 2 to Cassandra 3 we chose not to set
up RESTBase on the new nodes, but now the time has come to transition
RESTBase to them as well.
Bug: T184110
Change-Id: Ie2484c2175e56ed40e5108b6ec41adbccfa19bfa
---
M hieradata/role/codfw/restbase/production.yaml
A hieradata/role/codfw/restbase/production_ng.yaml
M hieradata/role/common/restbase/production_ng.yaml
M hieradata/role/eqiad/restbase/production.yaml
A hieradata/role/eqiad/restbase/production_ng.yaml
M modules/profile/manifests/restbase.pp
M modules/role/manifests/restbase/production_ng.pp
7 files changed, 100 insertions(+), 16 deletions(-)
Approvals:
Eevans: Looks good to me, but someone else must approve
Mobrovac: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/hieradata/role/codfw/restbase/production.yaml
b/hieradata/role/codfw/restbase/production.yaml
index ffebfa4..c820561 100644
--- a/hieradata/role/codfw/restbase/production.yaml
+++ b/hieradata/role/codfw/restbase/production.yaml
@@ -1,7 +1,3 @@
-profile::restbase::seeds:
- - restbase2007-a.codfw.wmnet
- - restbase2007-b.codfw.wmnet
- - restbase2007-c.codfw.wmnet
profile::restbase::seeds_ng:
- restbase2001-a.codfw.wmnet
- restbase2001-b.codfw.wmnet
@@ -17,9 +13,18 @@
- restbase2005-c.codfw.wmnet
# used for rate limiting
profile::restbase::hosts:
+ - restbase2001.codfw.wmnet
+ - restbase2002.codfw.wmnet
+ - restbase2003.codfw.wmnet
+ - restbase2004.codfw.wmnet
+ - restbase2005.codfw.wmnet
+ - restbase2006.codfw.wmnet
- restbase2007.codfw.wmnet
- restbase2008.codfw.wmnet
- restbase2009.codfw.wmnet
+ - restbase2010.codfw.wmnet
+ - restbase2011.codfw.wmnet
+ - restbase2012.codfw.wmnet
lvs::realserver::realserver_ips:
- '10.2.1.17' # restbase.svc.codfw.wmnet
diff --git a/hieradata/role/codfw/restbase/production_ng.yaml
b/hieradata/role/codfw/restbase/production_ng.yaml
new file mode 100644
index 0000000..c820561
--- /dev/null
+++ b/hieradata/role/codfw/restbase/production_ng.yaml
@@ -0,0 +1,30 @@
+profile::restbase::seeds_ng:
+ - restbase2001-a.codfw.wmnet
+ - restbase2001-b.codfw.wmnet
+ - restbase2001-c.codfw.wmnet
+ - restbase2002-a.codfw.wmnet
+ - restbase2002-b.codfw.wmnet
+ - restbase2002-c.codfw.wmnet
+ - restbase2003-a.codfw.wmnet
+ - restbase2003-b.codfw.wmnet
+ - restbase2003-c.codfw.wmnet
+ - restbase2005-a.codfw.wmnet
+ - restbase2005-b.codfw.wmnet
+ - restbase2005-c.codfw.wmnet
+# used for rate limiting
+profile::restbase::hosts:
+ - restbase2001.codfw.wmnet
+ - restbase2002.codfw.wmnet
+ - restbase2003.codfw.wmnet
+ - restbase2004.codfw.wmnet
+ - restbase2005.codfw.wmnet
+ - restbase2006.codfw.wmnet
+ - restbase2007.codfw.wmnet
+ - restbase2008.codfw.wmnet
+ - restbase2009.codfw.wmnet
+ - restbase2010.codfw.wmnet
+ - restbase2011.codfw.wmnet
+ - restbase2012.codfw.wmnet
+
+lvs::realserver::realserver_ips:
+ - '10.2.1.17' # restbase.svc.codfw.wmnet
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index bbeaea3..c73e81b 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -1,4 +1,29 @@
cluster: restbase
+
+#
+# RESTBase
+#
+profile::restbase::cassandra_local_dc: "%{::site}"
+profile::restbase::logging_label: restbase
+profile::restbase::cassandra_datacenters:
+ - "eqiad"
+ - "codfw"
+profile::restbase::parsoid_uri: "http://parsoid.discovery.wmnet:8000";
+profile::restbase::graphoid_uri: "http://graphoid.discovery.wmnet:19000";
+profile::restbase::mobileapps_uri: "http://mobileapps.discovery.wmnet:8888";
+profile::restbase::mathoid_uri: "http://mathoid.discovery.wmnet:10042";
+profile::restbase::aqs_uri:
"http://aqs.svc.%{::aqs_site}.wmnet:7232/analytics.wikimedia.org/v1";
+profile::restbase::pdfrender_uri: "http://pdfrender.discovery.wmnet:5252";
+profile::restbase::citoid_uri: "http://citoid.discovery.wmnet:1970";
+profile::restbase::eventlogging_service_uri:
"http://eventbus.discovery.wmnet:8085/v1/events";
+profile::restbase::cxserver_uri: "http://cxserver.discovery.wmnet:8080";
+profile::restbase::recommendation_uri:
"http://recommendation-api.discovery.wmnet:9632";
+profile::restbase::cassandra_user: restb
+profile::restbase::cassandra_password: "%{passwords::cassandra::restbase}"
+profile::restbase::monitor_domain: en.wikipedia.org
+profile::restbase::cassandra_tls:
+ ca: /dev/null
+
#
# Cassandra
#
diff --git a/hieradata/role/eqiad/restbase/production.yaml
b/hieradata/role/eqiad/restbase/production.yaml
index ff559bd..8d770bd 100644
--- a/hieradata/role/eqiad/restbase/production.yaml
+++ b/hieradata/role/eqiad/restbase/production.yaml
@@ -1,8 +1,3 @@
-profile::restbase::seeds:
- - restbase1011-a.eqiad.wmnet
- - restbase1011-b.eqiad.wmnet
- - restbase1013-a.eqiad.wmnet
- - restbase1013-b.eqiad.wmnet
profile::restbase::seeds_ng:
- restbase1008-a.eqiad.wmnet
- restbase1008-b.eqiad.wmnet
@@ -15,6 +10,15 @@
- restbase1010-c.eqiad.wmnet
# used for rate limiting
profile::restbase::hosts:
+ - restbase1007.eqiad.wmnet
+ - restbase1008.eqiad.wmnet
+ - restbase1009.eqiad.wmnet
+ - restbase1010.eqiad.wmnet
- restbase1011.eqiad.wmnet
+ - restbase1012.eqiad.wmnet
- restbase1013.eqiad.wmnet
+ - restbase1014.eqiad.wmnet
- restbase1015.eqiad.wmnet
+ - restbase1016.eqiad.wmnet
+ - restbase1017.eqiad.wmnet
+ - restbase1018.eqiad.wmnet
diff --git a/hieradata/role/eqiad/restbase/production_ng.yaml
b/hieradata/role/eqiad/restbase/production_ng.yaml
new file mode 100644
index 0000000..8d770bd
--- /dev/null
+++ b/hieradata/role/eqiad/restbase/production_ng.yaml
@@ -0,0 +1,24 @@
+profile::restbase::seeds_ng:
+ - restbase1008-a.eqiad.wmnet
+ - restbase1008-b.eqiad.wmnet
+ - restbase1008-c.eqiad.wmnet
+ - restbase1009-a.eqiad.wmnet
+ - restbase1009-b.eqiad.wmnet
+ - restbase1009-c.eqiad.wmnet
+ - restbase1010-a.eqiad.wmnet
+ - restbase1010-b.eqiad.wmnet
+ - restbase1010-c.eqiad.wmnet
+# used for rate limiting
+profile::restbase::hosts:
+ - restbase1007.eqiad.wmnet
+ - restbase1008.eqiad.wmnet
+ - restbase1009.eqiad.wmnet
+ - restbase1010.eqiad.wmnet
+ - restbase1011.eqiad.wmnet
+ - restbase1012.eqiad.wmnet
+ - restbase1013.eqiad.wmnet
+ - restbase1014.eqiad.wmnet
+ - restbase1015.eqiad.wmnet
+ - restbase1016.eqiad.wmnet
+ - restbase1017.eqiad.wmnet
+ - restbase1018.eqiad.wmnet
diff --git a/modules/profile/manifests/restbase.pp
b/modules/profile/manifests/restbase.pp
index 6aeba70..70c9072 100644
--- a/modules/profile/manifests/restbase.pp
+++ b/modules/profile/manifests/restbase.pp
@@ -71,7 +71,6 @@
class profile::restbase(
$cassandra_user = hiera('profile::restbase::cassandra_user'),
$cassandra_password = hiera('profile::restbase::cassandra_password'),
- $seeds = hiera('profile::restbase::seeds'),
$seeds_ng = hiera('profile::restbase::seeds_ng', []),
$hosts = hiera('profile::restbase::hosts'),
$cassandra_local_dc = hiera('profile::restbase::cassandra_local_dc'),
@@ -111,7 +110,6 @@
deployment_vars => {
ipaddress => $::ipaddress,
rl_seeds => reject(reject($hosts, $::hostname),
$::ipaddress),
- seeds => $seeds,
seeds_ng => $seeds_ng,
cassandra_local_dc => $cassandra_local_dc,
cassandra_datacenters => $cassandra_datacenters,
diff --git a/modules/role/manifests/restbase/production_ng.pp
b/modules/role/manifests/restbase/production_ng.pp
index 7e6a20c..56bc4c0 100644
--- a/modules/role/manifests/restbase/production_ng.pp
+++ b/modules/role/manifests/restbase/production_ng.pp
@@ -2,9 +2,7 @@
#
# Configures the production cluster (next-gen)
class role::restbase::production_ng {
- include ::passwords::cassandra
- include ::base::firewall
- include ::standard
- include ::profile::cassandra
- system::role { 'restbase': description => 'Restbase (Cassandra 3.x-only)' }
+ include ::role::restbase::base
+ include ::role::lvs::realserver
+ system::role { 'restbase': description => 'Restbase (production with
Cassandra 3.x)' }
}
--
To view, visit https://gerrit.wikimedia.org/r/401784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2484c2175e56ed40e5108b6ec41adbccfa19bfa
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
