Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392396 )
Change subject: cassandra: reprovision restbase2004 with cassandra 3
......................................................................
cassandra: reprovision restbase2004 with cassandra 3
Bug: T179422
Change-Id: If2cd6110906bb2a4be96efa7ebaa7a638a2a8095
---
M hieradata/hosts/restbase2004.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
5 files changed, 51 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/392396/1
diff --git a/hieradata/hosts/restbase2004.yaml
b/hieradata/hosts/restbase2004.yaml
index 3b092c6..3532992 100644
--- a/hieradata/hosts/restbase2004.yaml
+++ b/hieradata/hosts/restbase2004.yaml
@@ -1 +1,2 @@
profile::cassandra::rack: 'c'
+cassandra::jbod_devices: ['sda4', 'sdb4', 'sdc4', 'sdd4', 'sde4']
diff --git a/hieradata/role/common/restbase/production.yaml
b/hieradata/role/common/restbase/production.yaml
index 60ea1bc..6622dff 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -170,13 +170,13 @@
# listen_address: 10.192.32.135
# c:
# listen_address: 10.192.32.136
- "restbase2004.codfw.wmnet":
- a:
- listen_address: 10.192.32.137
- b:
- listen_address: 10.192.32.138
- c:
- listen_address: 10.192.32.139
+ #"restbase2004.codfw.wmnet":
+ # a:
+ # listen_address: 10.192.32.137
+ # b:
+ # listen_address: 10.192.32.138
+ # c:
+ # listen_address: 10.192.32.139
#"restbase2005.codfw.wmnet":
# a:
# listen_address: 10.192.48.46
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 4d9ecce..31e9967 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -15,7 +15,6 @@
- restbase1016.eqiad.wmnet
- restbase1017.eqiad.wmnet
- restbase1018.eqiad.wmnet
- - restbase2004.codfw.wmnet
- restbase2007.codfw.wmnet
- restbase2008.codfw.wmnet
- restbase2009.codfw.wmnet
@@ -298,6 +297,46 @@
hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
saved_caches_directory:
/srv/cassandra/instance-data/cassandra-c/saved_caches
jmx_exporter_enabled: true
+ "restbase2004.codfw.wmnet":
+ a:
+ listen_address: 10.192.32.137
+ data_file_directories:
+ - /srv/sda4/cassandra-a/data
+ - /srv/sdb4/cassandra-a/data
+ - /srv/sdc4/cassandra-a/data
+ - /srv/sdd4/cassandra-a/data
+ - /srv/sde4/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.192.32.138
+ data_file_directories:
+ - /srv/sda4/cassandra-b/data
+ - /srv/sdb4/cassandra-b/data
+ - /srv/sdc4/cassandra-b/data
+ - /srv/sdd4/cassandra-b/data
+ - /srv/sde4/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.192.32.139
+ data_file_directories:
+ - /srv/sda4/cassandra-c/data
+ - /srv/sdb4/cassandra-c/data
+ - /srv/sdc4/cassandra-c/data
+ - /srv/sdd4/cassandra-c/data
+ - /srv/sde4/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
"restbase2005.codfw.wmnet":
a:
listen_address: 10.192.48.46
diff --git a/manifests/site.pp b/manifests/site.pp
index c73ca89..8636191 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2129,11 +2129,11 @@
}
# restbase codfw cluster
-node /^restbase20(0[4789]|1[012])\.codfw\.wmnet$/ {
+node /^restbase20(0[789]|1[012])\.codfw\.wmnet$/ {
role(restbase::production)
}
-node /^restbase200[12356]\.codfw\.wmnet$/ {
+node /^restbase200[123456]\.codfw\.wmnet$/ {
role(restbase::production_ng)
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 1448b58..902d0b1 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -156,8 +156,7 @@
restbase101[1-5]) echo partman/cassandrahosts-5ssd.cfg ;; \
restbase101[6-8]|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd.cfg ;; \
- restbase200[12356]) echo partman/cassandrahosts-5ssd-jbod.cfg ;; \
- restbase200[4]) echo partman/cassandrahosts-5ssd.cfg ;; \
+ restbase200[123456]) echo partman/cassandrahosts-5ssd-jbod.cfg ;; \
restbase200[7-9]) echo partman/cassandrahosts-4ssd.cfg ;; \
restbase201[0-2]) echo partman/cassandrahosts-4ssd.cfg ;; \
rhenium) echo partman/raid1-gpt.cfg ;; \
--
To view, visit https://gerrit.wikimedia.org/r/392396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If2cd6110906bb2a4be96efa7ebaa7a638a2a8095
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
