[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: reprovision restbase1018
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404325 )
Change subject: restbase: reprovision restbase1018
..
restbase: reprovision restbase1018
Bug: T184100
Change-Id: I3a2ad3c40f24903b9faae012351a310365b01a88
---
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, 48 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 6326ff5..d1f6b2a 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -141,13 +141,13 @@
# listen_address: 10.64.32.131
# c:
# listen_address: 10.64.32.132
- "restbase1018.eqiad.wmnet":
-a:
- listen_address: 10.64.48.98
-b:
- listen_address: 10.64.48.99
-c:
- listen_address: 10.64.48.100
+ #"restbase1018.eqiad.wmnet":
+ # a:
+ #listen_address: 10.64.48.98
+ # b:
+ #listen_address: 10.64.48.99
+ # c:
+ #listen_address: 10.64.48.100
# "restbase2001.codfw.wmnet":
# a:
# listen_address: 10.192.16.162
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 4118263..c3d55a9 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -395,6 +395,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
+ "restbase1018.eqiad.wmnet":
+a:
+ listen_address: 10.64.48.98
+ 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.48.99
+ 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.48.100
+ 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
"restbase2001.codfw.wmnet":
a:
listen_address: 10.192.16.162
diff --git a/manifests/site.pp b/manifests/site.pp
index 456e8a7..1f83f6a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1843,11 +1843,11 @@
}
# restbase eqiad cluster
-node /^restbase101[3568]\.eqiad\.wmnet$/ {
+node /^restbase101[356]\.eqiad\.wmnet$/ {
role(spare::system)
}
-node /^restbase10(0[789]|1[01247])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[012478])\.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 ee406c4..aef94c4 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -155,8 +155,8 @@
restbase100[0-6]) echo partman/cassandrahosts-5ssd.cfg ;; \
restbase100[789]|restbase101[0124]) echo
partman/cassandrahosts-5ssd-jbod.cfg ;; \
restbase101[35]) echo partman/cassandrahosts-5ssd.cfg ;; \
-restbase1017) echo partman/cassandrahosts-4ssd-jbod.cfg ;; \
-restbase101[68]|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
+restbase101[78]) echo partman/cassandrahosts-4ssd-jbod.cfg ;; \
+restbase1016|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: reprovision restbase1018
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404325 )
Change subject: restbase: reprovision restbase1018
..
restbase: reprovision restbase1018
Bug: T184100
Change-Id: I3a2ad3c40f24903b9faae012351a310365b01a88
---
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, 48 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/404325/1
diff --git a/hieradata/role/common/restbase/production.yaml
b/hieradata/role/common/restbase/production.yaml
index 6326ff5..d1f6b2a 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -141,13 +141,13 @@
# listen_address: 10.64.32.131
# c:
# listen_address: 10.64.32.132
- "restbase1018.eqiad.wmnet":
-a:
- listen_address: 10.64.48.98
-b:
- listen_address: 10.64.48.99
-c:
- listen_address: 10.64.48.100
+ #"restbase1018.eqiad.wmnet":
+ # a:
+ #listen_address: 10.64.48.98
+ # b:
+ #listen_address: 10.64.48.99
+ # c:
+ #listen_address: 10.64.48.100
# "restbase2001.codfw.wmnet":
# a:
# listen_address: 10.192.16.162
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 4118263..c3d55a9 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -395,6 +395,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
+ "restbase1018.eqiad.wmnet":
+a:
+ listen_address: 10.64.48.98
+ 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.48.99
+ 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.48.100
+ 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
"restbase2001.codfw.wmnet":
a:
listen_address: 10.192.16.162
diff --git a/manifests/site.pp b/manifests/site.pp
index 967ed6a..03417e7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1834,11 +1834,11 @@
}
# restbase eqiad cluster
-node /^restbase101[3568]\.eqiad\.wmnet$/ {
+node /^restbase101[356]\.eqiad\.wmnet$/ {
role(spare::system)
}
-node /^restbase10(0[789]|1[01247])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[012478])\.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 ee406c4..aef94c4 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -155,8 +155,8 @@
restbase100[0-6]) echo partman/cassandrahosts-5ssd.cfg ;; \
restbase100[789]|restbase101[0124]) echo
partman/cassandrahosts-5ssd-jbod.cfg ;; \
restbase101[35]) echo partman/cassandrahosts-5ssd.cfg ;; \
-restbase1017) echo partman/cassandrahosts-4ssd-jbod.cfg ;; \
-restbase101[68]|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
+restbase101[78]) echo partman/cassandrahosts-4ssd-jbod.cfg ;; \
+restbase1016|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
restbase-test2*) echo partman/cassandrahosts-2ssd.cfg ;; \
