Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404652 )
Change subject: restbase: reprovision restbase201[012]
......................................................................
restbase: reprovision restbase201[012]
These hosts have been already reimaged and have all cassandra instances masked
already. Therefore we
can assign the restbase role for all, then enable instances one by one as
bootstrap complete:
systemctl unmask cassandra-<instance>
puppet agent --test
Bug: T184100
Change-Id: I9604283730214439cadb418bccb3a861fc13e561
---
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M manifests/site.pp
3 files changed, 134 insertions(+), 23 deletions(-)
Approvals:
Eevans: 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 f120bb9..d5a4fa0 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -211,27 +211,27 @@
listen_address: 10.192.48.55
c:
listen_address: 10.192.48.56
- "restbase2010.codfw.wmnet":
- a:
- listen_address: 10.192.16.186
- b:
- listen_address: 10.192.16.187
- c:
- listen_address: 10.192.16.188
- "restbase2011.codfw.wmnet":
- a:
- listen_address: 10.192.32.152
- b:
- listen_address: 10.192.32.153
- c:
- listen_address: 10.192.32.154
- "restbase2012.codfw.wmnet":
- a:
- listen_address: 10.192.48.68
- b:
- listen_address: 10.192.48.69
- c:
- listen_address: 10.192.48.70
+ #"restbase2010.codfw.wmnet":
+ # a:
+ # listen_address: 10.192.16.186
+ # b:
+ # listen_address: 10.192.16.187
+ # c:
+ # listen_address: 10.192.16.188
+ #"restbase2011.codfw.wmnet":
+ # a:
+ # listen_address: 10.192.32.152
+ # b:
+ # listen_address: 10.192.32.153
+ # c:
+ # listen_address: 10.192.32.154
+ #"restbase2012.codfw.wmnet":
+ # a:
+ # listen_address: 10.192.48.68
+ # b:
+ # listen_address: 10.192.48.69
+ # c:
+ # listen_address: 10.192.48.70
profile::cassandra::settings:
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 4290581..fc8c48b 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -789,6 +789,117 @@
hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
saved_caches_directory:
/srv/cassandra/instance-data/cassandra-c/saved_caches
jmx_exporter_enabled: true
+ "restbase2010.codfw.wmnet":
+ a:
+ listen_address: 10.192.16.186
+ 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.192.16.187
+ 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.192.16.188
+ 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
+ "restbase2011.codfw.wmnet":
+ a:
+ listen_address: 10.192.32.152
+ 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.192.32.153
+ 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.192.32.154
+ 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
+ "restbase2012.codfw.wmnet":
+ a:
+ listen_address: 10.192.48.68
+ 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.192.48.69
+ 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.192.48.70
+ 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
profile::cassandra::settings:
diff --git a/manifests/site.pp b/manifests/site.pp
index a8b60e0..a65daba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1870,11 +1870,11 @@
}
# restbase codfw cluster
-node /^restbase20(0[789]|1[012])\.codfw\.wmnet$/ {
+node /^restbase200[789]\.codfw\.wmnet$/ {
role(spare::system)
}
-node /^restbase200[123456]\.codfw\.wmnet$/ {
+node /^restbase20(0[123456]|1[012])\.codfw\.wmnet$/ {
role(restbase::production_ng)
}
--
To view, visit https://gerrit.wikimedia.org/r/404652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9604283730214439cadb418bccb3a861fc13e561
Gerrit-PatchSet: 3
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: Ppchelko <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
