Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394343 )
Change subject: cassandra: reprovision restbase1014 with cassandra 3
......................................................................
cassandra: reprovision restbase1014 with cassandra 3
Bug: T179422
Change-Id: Ib13cfee9ce4173e0bdb698cf91f320c715309b08
---
M hieradata/hosts/restbase1014.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, 52 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/394343/1
diff --git a/hieradata/hosts/restbase1014.yaml
b/hieradata/hosts/restbase1014.yaml
index ad21885..a9b287b 100644
--- a/hieradata/hosts/restbase1014.yaml
+++ b/hieradata/hosts/restbase1014.yaml
@@ -1 +1,2 @@
profile::cassandra::rack: 'd'
+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 709966c..98d9c76 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -114,13 +114,13 @@
listen_address: 10.64.32.206
c:
listen_address: 10.64.32.207
- "restbase1014.eqiad.wmnet":
- a:
- listen_address: 10.64.48.135
- b:
- listen_address: 10.64.48.136
- c:
- listen_address: 10.64.48.137
+ #"restbase1014.eqiad.wmnet":
+ # a:
+ # listen_address: 10.64.48.135
+ # b:
+ # listen_address: 10.64.48.136
+ # c:
+ # listen_address: 10.64.48.137
"restbase1015.eqiad.wmnet":
a:
listen_address: 10.64.48.138
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 0cd5317..bf3c8d6 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -8,7 +8,6 @@
profile::cassandra::extra_cql_hosts:
- restbase1011.eqiad.wmnet
- restbase1013.eqiad.wmnet
- - restbase1014.eqiad.wmnet
- restbase1015.eqiad.wmnet
- restbase1016.eqiad.wmnet
- restbase1017.eqiad.wmnet
@@ -255,6 +254,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
+ "restbase1014.eqiad.wmnet":
+ a:
+ listen_address: 10.64.48.135
+ 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.64.48.136
+ # 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.64.48.137
+ # 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
"restbase2001.codfw.wmnet":
a:
listen_address: 10.192.16.162
diff --git a/manifests/site.pp b/manifests/site.pp
index 911bd51..f99f577 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2068,11 +2068,11 @@
}
# restbase eqiad cluster
-node /^restbase101[1345678]\.eqiad\.wmnet$/ {
+node /^restbase101[135678]\.eqiad\.wmnet$/ {
role(restbase::production)
}
-node /^restbase10(0[789]|1[02])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[024])\.eqiad\.wmnet$/ {
role(restbase::production_ng)
}
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 6850167..26941d5 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -153,8 +153,8 @@
rdb100[7-8]) echo partman/raid1.cfg ;; \
rdb200[1-6]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
restbase100[0-6]) echo partman/cassandrahosts-5ssd.cfg ;; \
- restbase100[789]|restbase101[02]) echo
partman/cassandrahosts-5ssd-jbod.cfg ;; \
- restbase101[1-5]) echo partman/cassandrahosts-5ssd.cfg ;; \
+ restbase100[789]|restbase101[024]) echo
partman/cassandrahosts-5ssd-jbod.cfg ;; \
+ restbase101[135]) echo partman/cassandrahosts-5ssd.cfg ;; \
restbase101[6-8]|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd.cfg ;; \
restbase200[123456]) echo partman/cassandrahosts-5ssd-jbod.cfg ;; \
--
To view, visit https://gerrit.wikimedia.org/r/394343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib13cfee9ce4173e0bdb698cf91f320c715309b08
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
