Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403389 )
Change subject: restbase: reimage restbase1011 as cassandra 3
......................................................................
restbase: reimage restbase1011 as cassandra 3
Bug: T184100
Change-Id: I3d65e4be4670a4fc65ed54620e299419e3b288dc
---
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
4 files changed, 51 insertions(+), 11 deletions(-)
Approvals:
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/common/restbase/production.yaml
b/hieradata/role/common/restbase/production.yaml
index 7c41926..a7dc889 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -92,13 +92,13 @@
# listen_address: 10.64.0.115
# c:
# listen_address: 10.64.0.116
- "restbase1011.eqiad.wmnet":
- a:
- listen_address: 10.64.0.117
- b:
- listen_address: 10.64.0.118
- c:
- listen_address: 10.64.0.119
+ #"restbase1011.eqiad.wmnet":
+ # a:
+ # listen_address: 10.64.0.117
+ # b:
+ # listen_address: 10.64.0.118
+ # c:
+ # listen_address: 10.64.0.119
#"restbase1012.eqiad.wmnet":
# a:
# listen_address: 10.64.32.202
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 8be132f..1bc6155 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -238,6 +238,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
+ "restbase1011.eqiad.wmnet":
+ a:
+ listen_address: 10.64.0.117
+ 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.0.118
+ 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.0.119
+ 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
"restbase1012.eqiad.wmnet":
a:
listen_address: 10.64.32.202
diff --git a/manifests/site.pp b/manifests/site.pp
index 0d3ee07..020e122 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1876,11 +1876,11 @@
}
# restbase eqiad cluster
-node /^restbase101[135678]\.eqiad\.wmnet$/ {
+node /^restbase101[35678]\.eqiad\.wmnet$/ {
role(spare::system)
}
-node /^restbase10(0[789]|1[024])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[0124])\.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 78bf327..8232895 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[024]) echo
partman/cassandrahosts-5ssd-jbod.cfg ;; \
- restbase101[135]) echo partman/cassandrahosts-5ssd.cfg ;; \
+ restbase100[789]|restbase101[0124]) echo
partman/cassandrahosts-5ssd-jbod.cfg ;; \
+ restbase101[35]) 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/403389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d65e4be4670a4fc65ed54620e299419e3b288dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
