[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: reprovision restbase1017
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404262 )
Change subject: restbase: reprovision restbase1017
..
restbase: reprovision restbase1017
This host has 4 ssds, thus also introduce the corresponding partman recipe for
JBOD.
Bug: T184100
Change-Id: I1f7e0e0f3bf32d7255c24f8c1cb7ff4f1cf21d9d
---
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
A modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-jbod.cfg
5 files changed, 120 insertions(+), 10 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 a7dc889..6326ff5 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -134,13 +134,13 @@
listen_address: 10.64.0.33
c:
listen_address: 10.64.0.34
- "restbase1017.eqiad.wmnet":
-a:
- listen_address: 10.64.32.130
-b:
- listen_address: 10.64.32.131
-c:
- listen_address: 10.64.32.132
+ # "restbase1017.eqiad.wmnet":
+ # a:
+ # listen_address: 10.64.32.130
+ # b:
+ # listen_address: 10.64.32.131
+ # c:
+ # listen_address: 10.64.32.132
"restbase1018.eqiad.wmnet":
a:
listen_address: 10.64.48.98
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 1bc6155..c29b1d7 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -358,6 +358,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
+ "restbase1017.eqiad.wmnet":
+a:
+ listen_address: 10.64.32.130
+ 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.32.131
+# 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.32.132
+# 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 8803b67..cc900c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1834,11 +1834,11 @@
}
# restbase eqiad cluster
-node /^restbase101[35678]\.eqiad\.wmnet$/ {
+node /^restbase101[3568]\.eqiad\.wmnet$/ {
role(spare::system)
}
-node /^restbase10(0[789]|1[0124])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[01247])\.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 8232895..ee406c4 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -155,7 +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 ;; \
-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: reprovision restbase1017
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404262 )
Change subject: restbase: reprovision restbase1017
..
restbase: reprovision restbase1017
This host has 4 ssds, thus also introduce the corresponding partman recipe for
JBOD.
Bug: T184100
Change-Id: I1f7e0e0f3bf32d7255c24f8c1cb7ff4f1cf21d9d
---
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
A modules/install_server/files/autoinstall/partman/cassandrahosts-4ssd-jbod.cfg
5 files changed, 120 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/404262/1
diff --git a/hieradata/role/common/restbase/production.yaml
b/hieradata/role/common/restbase/production.yaml
index a7dc889..6326ff5 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -134,13 +134,13 @@
listen_address: 10.64.0.33
c:
listen_address: 10.64.0.34
- "restbase1017.eqiad.wmnet":
-a:
- listen_address: 10.64.32.130
-b:
- listen_address: 10.64.32.131
-c:
- listen_address: 10.64.32.132
+ # "restbase1017.eqiad.wmnet":
+ # a:
+ # listen_address: 10.64.32.130
+ # b:
+ # listen_address: 10.64.32.131
+ # c:
+ # listen_address: 10.64.32.132
"restbase1018.eqiad.wmnet":
a:
listen_address: 10.64.48.98
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 1bc6155..c29b1d7 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -358,6 +358,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
+ "restbase1017.eqiad.wmnet":
+a:
+ listen_address: 10.64.32.130
+ 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.32.131
+# 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.32.132
+# 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 8803b67..cc900c4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1834,11 +1834,11 @@
}
# restbase eqiad cluster
-node /^restbase101[35678]\.eqiad\.wmnet$/ {
+node /^restbase101[3568]\.eqiad\.wmnet$/ {
role(spare::system)
}
-node /^restbase10(0[789]|1[0124])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[01247])\.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 8232895..ee406c4 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -155,7 +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 ;; \
-restbase101[6-8]|restbase-dev100[456]) echo
partman/cassandrahosts-4ssd.cfg ;; \
+
