Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404638 )
Change subject: restbase: reprovision restbase1016
......................................................................
restbase: reprovision restbase1016
Bug: T184100
Change-Id: I1347aa226442dbf705981ede1e1d134f6494fd3a
---
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M manifests/site.pp
3 files changed, 46 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/hieradata/role/common/restbase/production.yaml
b/hieradata/role/common/restbase/production.yaml
index d1f6b2a..538b08f 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -127,13 +127,13 @@
listen_address: 10.64.48.139
c:
listen_address: 10.64.48.140
- "restbase1016.eqiad.wmnet":
- a:
- listen_address: 10.64.0.32
- b:
- listen_address: 10.64.0.33
- c:
- listen_address: 10.64.0.34
+ #"restbase1016.eqiad.wmnet":
+ # a:
+ # listen_address: 10.64.0.32
+ # b:
+ # listen_address: 10.64.0.33
+ # c:
+ # listen_address: 10.64.0.34
# "restbase1017.eqiad.wmnet":
# a:
# listen_address: 10.64.32.130
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index c3d55a9..e986220 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -358,6 +358,43 @@
hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
saved_caches_directory:
/srv/cassandra/instance-data/cassandra-c/saved_caches
jmx_exporter_enabled: true
+ "restbase1016.eqiad.wmnet":
+ a:
+ listen_address: 10.64.0.32
+ data_file_directories:
+ - /srv/sda4/cassandra-a/data
+ - /srv/sdb4/cassandra-a/data
+ - /srv/sdc4/cassandra-a/data
+ - /srv/sdd4/cassandra-a/data
+ heapdump_directory: /srv/sda4/cassandra-a
+ commitlog_directory: /srv/cassandra/instance-data/cassandra-a/commitlog
+ hints_directory: /srv/cassandra/instance-data/cassandra-a/hints
+ saved_caches_directory:
/srv/cassandra/instance-data/cassandra-a/saved_caches
+ jmx_exporter_enabled: true
+ b:
+ listen_address: 10.64.0.33
+ data_file_directories:
+ - /srv/sda4/cassandra-b/data
+ - /srv/sdb4/cassandra-b/data
+ - /srv/sdc4/cassandra-b/data
+ - /srv/sdd4/cassandra-b/data
+ heapdump_directory: /srv/sdb4/cassandra-b
+ commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog
+ hints_directory: /srv/cassandra/instance-data/cassandra-b/hints
+ saved_caches_directory:
/srv/cassandra/instance-data/cassandra-b/saved_caches
+ jmx_exporter_enabled: true
+ c:
+ listen_address: 10.64.0.34
+ data_file_directories:
+ - /srv/sda4/cassandra-c/data
+ - /srv/sdb4/cassandra-c/data
+ - /srv/sdc4/cassandra-c/data
+ - /srv/sdd4/cassandra-c/data
+ heapdump_directory: /srv/sdc4/cassandra-c
+ commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog
+ hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
+ saved_caches_directory:
/srv/cassandra/instance-data/cassandra-c/saved_caches
+ jmx_exporter_enabled: true
"restbase1017.eqiad.wmnet":
a:
listen_address: 10.64.32.130
diff --git a/manifests/site.pp b/manifests/site.pp
index 3a27719..5bcacc3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1881,11 +1881,11 @@
}
# restbase eqiad cluster
-node /^restbase101[356]\.eqiad\.wmnet$/ {
+node /^restbase101[35]\.eqiad\.wmnet$/ {
role(spare::system)
}
-node /^restbase10(0[789]|1[012478])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[0124678])\.eqiad\.wmnet$/ {
role(restbase::production_ng)
}
--
To view, visit https://gerrit.wikimedia.org/r/404638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1347aa226442dbf705981ede1e1d134f6494fd3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@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
