Gehel has submitted this change and it was merged.
Change subject: Enable kartotherian service check for all maps servers
......................................................................
Enable kartotherian service check for all maps servers
Now that specs have been properly tested, we can enable them for all maps
servers.
Bug: T137617
Change-Id: I3b61be2311a9e3506d6b386c97e56026eee3be8f
---
M hieradata/hosts/maps2001.yaml
M hieradata/role/common/maps/server.yaml
M modules/kartotherian/manifests/init.pp
3 files changed, 2 insertions(+), 13 deletions(-)
Approvals:
Gehel: Looks good to me, approved
Yurik: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/hosts/maps2001.yaml b/hieradata/hosts/maps2001.yaml
index adafca6..db7b54b 100644
--- a/hieradata/hosts/maps2001.yaml
+++ b/hieradata/hosts/maps2001.yaml
@@ -15,5 +15,3 @@
tilerator::conf_sources: sources.prod2.yaml
tilerator::ui::conf_sources: sources.prod2.yaml
kartotherian::conf_sources: sources.prod2.yaml
-# enable specs only on maps2001 for testing
-kartotherian::enable_spec: true
diff --git a/hieradata/role/common/maps/server.yaml
b/hieradata/role/common/maps/server.yaml
index 47dab51..0249efa 100644
--- a/hieradata/role/common/maps/server.yaml
+++ b/hieradata/role/common/maps/server.yaml
@@ -12,6 +12,3 @@
- tilerator-admin
service::configuration::logstash_host: logstash1001.eqiad.wmnet
service::configuration::statsd_host: statsd.eqiad.wmnet
-
-# Let's keep spec disabled until it is correctly tested
-kartotherian::enable_spec: false
diff --git a/modules/kartotherian/manifests/init.pp
b/modules/kartotherian/manifests/init.pp
index f04ac7d..0638390 100644
--- a/modules/kartotherian/manifests/init.pp
+++ b/modules/kartotherian/manifests/init.pp
@@ -8,7 +8,6 @@
# service
class kartotherian(
$conf_sources = 'sources.prod.yaml',
- $enable_spec = true,
) {
$cassandra_kartotherian_user = 'kartotherian'
@@ -16,16 +15,11 @@
$pgsql_kartotherian_user = 'kartotherian'
$pgsql_kartotherian_pass = hiera('maps::postgresql_kartotherian_pass')
- $monitor_url = $enable_spec ? {
- true => '',
- default => '/_info',
- }
-
service::node { 'kartotherian':
port => 6533,
config => template('kartotherian/config.yaml.erb'),
deployment => 'scap3',
- has_spec => $enable_spec,
- healthcheck_url => $monitor_url,
+ has_spec => true,
+ healthcheck_url => '',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/294333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b61be2311a9e3506d6b386c97e56026eee3be8f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
