Filippo Giunchedi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/405312 )
Change subject: restbase: reprovision restbase200[789] ...................................................................... restbase: reprovision restbase200[789] 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: I5a4c99b2a49da13c8d2f5ad13d786aa7d18b028c --- M hieradata/role/common/restbase/production.yaml M hieradata/role/common/restbase/production_ng.yaml M manifests/site.pp 3 files changed, 139 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/12/405312/1 diff --git a/hieradata/role/common/restbase/production.yaml b/hieradata/role/common/restbase/production.yaml index d5a4fa0..c7ed3a1 100644 --- a/hieradata/role/common/restbase/production.yaml +++ b/hieradata/role/common/restbase/production.yaml @@ -190,27 +190,27 @@ # listen_address: 10.192.48.50 # c: # listen_address: 10.192.48.51 - "restbase2007.codfw.wmnet": - a: - listen_address: 10.192.16.176 - b: - listen_address: 10.192.16.177 - c: - listen_address: 10.192.16.178 - "restbase2008.codfw.wmnet": - a: - listen_address: 10.192.32.143 - b: - listen_address: 10.192.32.144 - c: - listen_address: 10.192.32.145 - "restbase2009.codfw.wmnet": - a: - listen_address: 10.192.48.54 - b: - listen_address: 10.192.48.55 - c: - listen_address: 10.192.48.56 + #"restbase2007.codfw.wmnet": + # a: + # listen_address: 10.192.16.176 + # b: + # listen_address: 10.192.16.177 + # c: + # listen_address: 10.192.16.178 + #"restbase2008.codfw.wmnet": + # a: + # listen_address: 10.192.32.143 + # b: + # listen_address: 10.192.32.144 + # c: + # listen_address: 10.192.32.145 + #"restbase2009.codfw.wmnet": + # a: + # listen_address: 10.192.48.54 + # b: + # listen_address: 10.192.48.55 + # c: + # listen_address: 10.192.48.56 #"restbase2010.codfw.wmnet": # a: # listen_address: 10.192.16.186 diff --git a/hieradata/role/common/restbase/production_ng.yaml b/hieradata/role/common/restbase/production_ng.yaml index fc8c48b..8ae06f3 100644 --- a/hieradata/role/common/restbase/production_ng.yaml +++ b/hieradata/role/common/restbase/production_ng.yaml @@ -789,6 +789,123 @@ hints_directory: /srv/cassandra/instance-data/cassandra-c/hints saved_caches_directory: /srv/cassandra/instance-data/cassandra-c/saved_caches jmx_exporter_enabled: true + "restbase2007.codfw.wmnet": + a: + listen_address: 10.192.16.176 + 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.192.16.177 + 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.192.16.178 + 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 + "restbase2008.codfw.wmnet": + a: + listen_address: 10.192.32.143 + 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.192.32.144 + 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.192.32.145 + 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 + "restbase2009.codfw.wmnet": + a: + listen_address: 10.192.48.54 + 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.55 + 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.56 + 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 "restbase2010.codfw.wmnet": a: listen_address: 10.192.16.186 diff --git a/manifests/site.pp b/manifests/site.pp index fd1da35..394bb9b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1870,11 +1870,7 @@ } # restbase codfw cluster -node /^restbase200[789]\.codfw\.wmnet$/ { - role(spare::system) -} - -node /^restbase20(0[123456]|1[012])\.codfw\.wmnet$/ { +node /^restbase20(0[1-9]|1[012])\.codfw\.wmnet$/ { role(restbase::production_ng) } -- To view, visit https://gerrit.wikimedia.org/r/405312 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a4c99b2a49da13c8d2f5ad13d786aa7d18b028c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits