Filippo Giunchedi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404675 )
Change subject: restbase: reprovision restbase101[35] ...................................................................... restbase: reprovision restbase101[35] 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: I8893de5a90ce55613279734357318b2e4e52de8e --- 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, 96 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/75/404675/1 diff --git a/hieradata/role/common/restbase/production.yaml b/hieradata/role/common/restbase/production.yaml index 538b08f..f120bb9 100644 --- a/hieradata/role/common/restbase/production.yaml +++ b/hieradata/role/common/restbase/production.yaml @@ -106,13 +106,13 @@ # listen_address: 10.64.32.203 # c: # listen_address: 10.64.32.204 - "restbase1013.eqiad.wmnet": - a: - listen_address: 10.64.32.205 - b: - listen_address: 10.64.32.206 - c: - listen_address: 10.64.32.207 + #"restbase1013.eqiad.wmnet": + # a: + # listen_address: 10.64.32.205 + # b: + # listen_address: 10.64.32.206 + # c: + # listen_address: 10.64.32.207 #"restbase1014.eqiad.wmnet": # a: # listen_address: 10.64.48.135 @@ -120,13 +120,13 @@ # listen_address: 10.64.48.136 # c: # listen_address: 10.64.48.137 - "restbase1015.eqiad.wmnet": - a: - listen_address: 10.64.48.138 - b: - listen_address: 10.64.48.139 - c: - listen_address: 10.64.48.140 + #"restbase1015.eqiad.wmnet": + # a: + # listen_address: 10.64.48.138 + # b: + # listen_address: 10.64.48.139 + # c: + # listen_address: 10.64.48.140 #"restbase1016.eqiad.wmnet": # a: # listen_address: 10.64.0.32 diff --git a/hieradata/role/common/restbase/production_ng.yaml b/hieradata/role/common/restbase/production_ng.yaml index e986220..4290581 100644 --- a/hieradata/role/common/restbase/production_ng.yaml +++ b/hieradata/role/common/restbase/production_ng.yaml @@ -318,6 +318,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 + "restbase1013.eqiad.wmnet": + a: + listen_address: 10.64.32.205 + 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.206 + 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.207 + 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 "restbase1014.eqiad.wmnet": a: listen_address: 10.64.48.135 @@ -358,6 +398,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 + "restbase1015.eqiad.wmnet": + a: + listen_address: 10.64.48.138 + 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.48.139 + 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.48.140 + 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 "restbase1016.eqiad.wmnet": a: listen_address: 10.64.0.32 diff --git a/manifests/site.pp b/manifests/site.pp index 5bcacc3..b19ff95 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1881,11 +1881,7 @@ } # restbase eqiad cluster -node /^restbase101[35]\.eqiad\.wmnet$/ { - role(spare::system) -} - -node /^restbase10(0[789]|1[0124678])\.eqiad\.wmnet$/ { +node /^restbase10(0[789]|1[012345678])\.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 47840fb..829db76 100755 --- a/modules/install_server/files/autoinstall/netboot.cfg +++ b/modules/install_server/files/autoinstall/netboot.cfg @@ -153,8 +153,7 @@ 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[0124]) echo partman/cassandrahosts-5ssd-jbod.cfg ;; \ - restbase101[35]) echo partman/cassandrahosts-5ssd.cfg ;; \ + restbase100[789]|restbase101[012345]) echo partman/cassandrahosts-5ssd-jbod.cfg ;; \ restbase101[678]) echo partman/cassandrahosts-4ssd-jbod.cfg ;; \ restbase-dev100[456]) echo partman/cassandrahosts-4ssd.cfg ;; \ restbase-test2*) echo partman/cassandrahosts-2ssd.cfg ;; \ -- To view, visit https://gerrit.wikimedia.org/r/404675 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8893de5a90ce55613279734357318b2e4e52de8e 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