Gehel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383398 )
Change subject: maps: isolate maps-test2004 to test vector tiles ...................................................................... maps: isolate maps-test2004 to test vector tiles Bug: T153282 Change-Id: I004790c3528cf4e3a5a23329eed5df67358739fd --- M hieradata/role/codfw/maps/test/master.yaml A hieradata/role/codfw/maps/test/vectortiles_master.yaml A hieradata/role/common/maps/test/vectortiles_master.yaml A modules/role/manifests/maps/test/vectortiles_master.pp 4 files changed, 64 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/98/383398/1 diff --git a/hieradata/role/codfw/maps/test/master.yaml b/hieradata/role/codfw/maps/test/master.yaml index 99707a4..c6e14d4 100644 --- a/hieradata/role/codfw/maps/test/master.yaml +++ b/hieradata/role/codfw/maps/test/master.yaml @@ -2,12 +2,10 @@ - 'maps-test2001.codfw.wmnet' - 'maps-test2002.codfw.wmnet' - 'maps-test2003.codfw.wmnet' - - 'maps-test2004.codfw.wmnet' profile::redis::master::clients: - 'maps-test2001.codfw.wmnet' - 'maps-test2002.codfw.wmnet' - 'maps-test2003.codfw.wmnet' - - 'maps-test2004.codfw.wmnet' profile::maps::apps::redis_server: 'redis://maps-test2001.codfw.wmnet' @@ -16,15 +14,12 @@ - '10.192.0.128' - '10.192.0.129' - '10.192.16.34' - - '10.192.16.35' profile::maps::osm_master::slaves: maps-test2002: ip_address: 10.192.0.129 maps-test2003: ip_address: 10.192.16.34 - maps-test2004: - ip_address: 10.192.16.35 profile::maps::osm_master::planet_sync_period: 'minute' profile::maps::osm_master::planet_sync_hour: '*' diff --git a/hieradata/role/codfw/maps/test/vectortiles_master.yaml b/hieradata/role/codfw/maps/test/vectortiles_master.yaml new file mode 100644 index 0000000..7cd03e8 --- /dev/null +++ b/hieradata/role/codfw/maps/test/vectortiles_master.yaml @@ -0,0 +1,18 @@ +profile::maps::hosts: + - 'maps-test2004.codfw.wmnet' +profile::redis::master::clients: + - 'maps-test2004.codfw.wmnet' + +profile::maps::apps::redis_server: 'redis://maps-test2004.codfw.wmnet' + +profile::cassandra::single_instance::dc: 'codfw' +profile::cassandra::single_instance::seeds: + - '10.192.16.35' + +profile::maps::osm_master::slaves: + maps-test2004: + ip_address: 10.192.16.35 + +profile::maps::osm_master::planet_sync_period: 'minute' +profile::maps::osm_master::planet_sync_hour: '*' +profile::maps::osm_master::planet_sync_minute: '*' diff --git a/hieradata/role/common/maps/test/vectortiles_master.yaml b/hieradata/role/common/maps/test/vectortiles_master.yaml new file mode 100644 index 0000000..65d70df --- /dev/null +++ b/hieradata/role/common/maps/test/vectortiles_master.yaml @@ -0,0 +1,30 @@ +# the following passwords are defined in private repo: +#profile::maps::osm_master::kartotherian_pass: some_password +#profile::maps::osm_master::tilerator_pass: some_password +#profile::maps::osm_master::tileratorui_pass: some_password +#profile::maps::osm_master::osmimporter_pass: some_password +#profile::maps::osm_master::osmupdater_pass: some_password +#profile::maps::osm_master::replication_pass: some_password +#profile::maps::cassandra::kartotherian_pass: some_password +#profile::maps::cassandra::tilerator_pass: some_password +#profile::maps::cassandra::tileratorui_pass: some_password +#profile::cassandra::single_instance::super_pass: some_password + +admin::groups: + - maps-admins + - kartotherian-admin + - tilerator-admin + +cluster: 'maps-test-vectortiles' + +profile::cassandra::single_instance::graphite_host: 'graphite-in.eqiad.wmnet' + +cassandra::metrics::blacklist: + - .*\.metrics\.Table\..*$ + +profile::redis::master::instances: ['6379'] +profile::redis::master::settings: + bind: "0.0.0.0" + +profile::maps::postgresql_common::shared_buffers: '4GB' +profile::maps::postgresql_common::maintenance_work_mem: '3GB' diff --git a/modules/role/manifests/maps/test/vectortiles_master.pp b/modules/role/manifests/maps/test/vectortiles_master.pp new file mode 100644 index 0000000..7e4f278 --- /dev/null +++ b/modules/role/manifests/maps/test/vectortiles_master.pp @@ -0,0 +1,16 @@ +# Sets up a maps server master +class role::maps::test::vectortiles_master { + include ::standard + include ::base::firewall + + include ::profile::maps::apps + include ::profile::maps::cassandra + include ::profile::maps::osm_master + include ::profile::redis::master + + system::role { 'role::maps::test::vectortiles_master': + ensure => 'present', + description => 'Maps master (postgresql, cassandra, redis, tilerator, kartotherian)', + } + +} -- To view, visit https://gerrit.wikimedia.org/r/383398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I004790c3528cf4e3a5a23329eed5df67358739fd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits