Gehel has submitted this change and it was merged. (
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
M hieradata/role/codfw/maps/test/slave.yaml
A hieradata/role/codfw/maps/test/vectortiles_master.yaml
A hieradata/role/common/maps/test/vectortiles_master.yaml
M manifests/site.pp
A modules/role/manifests/maps/test/vectortiles_master.pp
6 files changed, 75 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, approved
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/slave.yaml
b/hieradata/role/codfw/maps/test/slave.yaml
index 54563bd..a865e59 100644
--- a/hieradata/role/codfw/maps/test/slave.yaml
+++ b/hieradata/role/codfw/maps/test/slave.yaml
@@ -2,7 +2,6 @@
- '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'
@@ -11,6 +10,5 @@
- '10.192.0.128'
- '10.192.0.129'
- '10.192.16.34'
- - '10.192.16.35'
profile::maps::osm_slave::master: 'maps-test2001.codfw.wmnet'
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..317a441
--- /dev/null
+++ b/hieradata/role/common/maps/test/vectortiles_master.yaml
@@ -0,0 +1,32 @@
+# 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'
+
+standard::has_ganglia: false
diff --git a/manifests/site.pp b/manifests/site.pp
index c9f0a44..90d1734 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1546,10 +1546,14 @@
role(maps::test::master)
}
-node /^maps-test200[2-4]\.codfw\.wmnet/ {
+node /^maps-test200[23]\.codfw\.wmnet/ {
role(maps::test::slave)
}
+node 'maps-test2004.codfw.wmnet' {
+ role(maps::test::vectortiles_master)
+}
+
node 'maps1001.eqiad.wmnet' {
role(maps::master)
}
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..62776c9
--- /dev/null
+++ b/modules/role/manifests/maps/test/vectortiles_master.pp
@@ -0,0 +1,20 @@
+# Sets up a maps server master
+class role::maps::test::vectortiles_master {
+ include ::standard
+
+ # TODO: move to profile::base::firewall once
https://gerrit.wikimedia.org/r/#/c/383519/ is merged
+ # lint:ignore:wmf_styleguide
+ include ::base::firewall
+ # lint:endignore
+
+ 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: merged
Gerrit-Change-Id: I004790c3528cf4e3a5a23329eed5df67358739fd
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
