Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351872 )
Change subject: maps - align configuration for all maps clusters
......................................................................
maps - align configuration for all maps clusters
For "historical" reasons the maps-test cluster has a different configuration
of sources. This does not make sense, and since we plan on reimaging this
cluster, it is the right time to align the configuration.
Bug: T160215
Change-Id: I2f30fc903756eee2c5f2579a117e18ae4973dab8
---
M hieradata/role/codfw/maps/master.yaml
M hieradata/role/codfw/maps/slave.yaml
M hieradata/role/codfw/maps/test/master.yaml
M hieradata/role/codfw/maps/test/slave.yaml
M hieradata/role/common/maps/master.yaml
M hieradata/role/common/maps/slave.yaml
M hieradata/role/common/maps/test/master.yaml
M hieradata/role/common/maps/test/slave.yaml
M hieradata/role/eqiad/maps/master.yaml
M hieradata/role/eqiad/maps/slave.yaml
10 files changed, 8 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/351872/1
diff --git a/hieradata/role/codfw/maps/master.yaml
b/hieradata/role/codfw/maps/master.yaml
index 0c7a85c..c976357 100644
--- a/hieradata/role/codfw/maps/master.yaml
+++ b/hieradata/role/codfw/maps/master.yaml
@@ -5,8 +5,6 @@
- 'maps2004.codfw.wmnet'
profile::maps::apps::redis_server: 'redis://maps2001.codfw.wmnet'
-profile::maps::apps::conf_sources: 'sources.prod2.yaml'
-profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::dc: 'codfw'
profile::maps::cassandra::seeds:
diff --git a/hieradata/role/codfw/maps/slave.yaml
b/hieradata/role/codfw/maps/slave.yaml
index 1dd01fb..bcef8f3 100644
--- a/hieradata/role/codfw/maps/slave.yaml
+++ b/hieradata/role/codfw/maps/slave.yaml
@@ -5,8 +5,6 @@
- 'maps2004.codfw.wmnet'
profile::maps::apps::redis_server: 'redis://maps2001.codfw.wmnet'
-profile::maps::apps::conf_sources: 'sources.prod2.yaml'
-profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::dc: 'codfw'
profile::maps::cassandra::seeds:
diff --git a/hieradata/role/codfw/maps/test/master.yaml
b/hieradata/role/codfw/maps/test/master.yaml
index ab17bbe..f92206c 100644
--- a/hieradata/role/codfw/maps/test/master.yaml
+++ b/hieradata/role/codfw/maps/test/master.yaml
@@ -5,8 +5,6 @@
- 'maps-test2004.codfw.wmnet'
profile::maps::apps::redis_server: 'redis://maps-test2001.codfw.wmnet'
-profile::maps::apps::conf_sources: 'sources.prod.yaml'
-profile::maps::apps::storage_id: 'v5'
profile::maps::cassandra::dc: 'codfw'
profile::maps::cassandra::seeds:
diff --git a/hieradata/role/codfw/maps/test/slave.yaml
b/hieradata/role/codfw/maps/test/slave.yaml
index cbbfc4b..fff996f 100644
--- a/hieradata/role/codfw/maps/test/slave.yaml
+++ b/hieradata/role/codfw/maps/test/slave.yaml
@@ -5,8 +5,6 @@
- 'maps-test2004.codfw.wmnet'
profile::maps::apps::redis_server: 'redis://maps-test2001.codfw.wmnet'
-profile::maps::apps::conf_sources: 'sources.prod.yaml'
-profile::maps::apps::storage_id: 'v5'
profile::maps::cassandra::dc: 'codfw'
profile::maps::cassandra::seeds:
diff --git a/hieradata/role/common/maps/master.yaml
b/hieradata/role/common/maps/master.yaml
index 8775379..6a92929 100644
--- a/hieradata/role/common/maps/master.yaml
+++ b/hieradata/role/common/maps/master.yaml
@@ -24,6 +24,8 @@
debdeploy-maps-master:
value: standard
+profile::maps::apps::conf_sources: 'sources.prod2.yaml'
+profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::graphite_host: 'graphite-in.eqiad.wmnet'
service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
service::configuration::statsd_host: 'statsd.eqiad.wmnet'
diff --git a/hieradata/role/common/maps/slave.yaml
b/hieradata/role/common/maps/slave.yaml
index 1799945..8cc6f20 100644
--- a/hieradata/role/common/maps/slave.yaml
+++ b/hieradata/role/common/maps/slave.yaml
@@ -24,6 +24,8 @@
debdeploy-maps-slave:
value: standard
+profile::maps::apps::conf_sources: 'sources.prod2.yaml'
+profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::graphite_host: 'graphite-in.eqiad.wmnet'
service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
service::configuration::statsd_host: 'statsd.eqiad.wmnet'
diff --git a/hieradata/role/common/maps/test/master.yaml
b/hieradata/role/common/maps/test/master.yaml
index 000a956..46972ea 100644
--- a/hieradata/role/common/maps/test/master.yaml
+++ b/hieradata/role/common/maps/test/master.yaml
@@ -21,6 +21,8 @@
debdeploy-maps-master:
value: standard
+profile::maps::apps::conf_sources: 'sources.prod2.yaml'
+profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::graphite_host: 'graphite-in.eqiad.wmnet'
service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
service::configuration::statsd_host: 'statsd.eqiad.wmnet'
diff --git a/hieradata/role/common/maps/test/slave.yaml
b/hieradata/role/common/maps/test/slave.yaml
index a81528d..ebe17f1 100644
--- a/hieradata/role/common/maps/test/slave.yaml
+++ b/hieradata/role/common/maps/test/slave.yaml
@@ -21,6 +21,8 @@
debdeploy-maps-slave:
value: standard
+profile::maps::apps::conf_sources: 'sources.prod2.yaml'
+profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::graphite_host: 'graphite-in.eqiad.wmnet'
service::configuration::logstash_host: 'logstash1001.eqiad.wmnet'
service::configuration::statsd_host: 'statsd.eqiad.wmnet'
diff --git a/hieradata/role/eqiad/maps/master.yaml
b/hieradata/role/eqiad/maps/master.yaml
index 8afcc4d..5d2116c 100644
--- a/hieradata/role/eqiad/maps/master.yaml
+++ b/hieradata/role/eqiad/maps/master.yaml
@@ -5,8 +5,6 @@
- 'maps1004.eqiad.wmnet'
profile::maps::apps::redis_server: 'redis://maps1001.eqiad.wmnet'
-profile::maps::apps::conf_sources: 'sources.prod2.yaml'
-profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::dc: 'eqiad'
profile::maps::cassandra::seeds:
diff --git a/hieradata/role/eqiad/maps/slave.yaml
b/hieradata/role/eqiad/maps/slave.yaml
index 358d44a..9e9c166 100644
--- a/hieradata/role/eqiad/maps/slave.yaml
+++ b/hieradata/role/eqiad/maps/slave.yaml
@@ -5,8 +5,6 @@
- 'maps1004.eqiad.wmnet'
profile::maps::apps::redis_server: 'redis://maps1001.eqiad.wmnet'
-profile::maps::apps::conf_sources: 'sources.prod2.yaml'
-profile::maps::apps::storage_id: 'v3'
profile::maps::cassandra::dc: 'eqiad'
profile::maps::cassandra::seeds:
--
To view, visit https://gerrit.wikimedia.org/r/351872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f30fc903756eee2c5f2579a117e18ae4973dab8
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
