Alexandros Kosiaris has submitted this change and it was merged.
Change subject: RESTBase: make the port fully configurable and change for AQS
to 7232
......................................................................
RESTBase: make the port fully configurable and change for AQS to 7232
There are some places where we make the assumption of RESTBase running
on port 7231. However, with the introduction of AQS, we need to be able
to fully configure it, as they both can't have the same port due to LVS.
Also: conftool-data/services/services.yaml defined zotero's port as 7231
for some reason. This patch changes it to 1969.
Bug: T116245
Change-Id: Ibaecb8f6ee5491362100fe32be2b65d755032b27
---
M conftool-data/services/services.yaml
M hieradata/role/common/aqs.yaml
M hieradata/role/common/restbase.yaml
M manifests/role/aqs.pp
M modules/restbase/manifests/monitoring.pp
5 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool-data/services/services.yaml
b/conftool-data/services/services.yaml
index fcb1231..f80d67c 100644
--- a/conftool-data/services/services.yaml
+++ b/conftool-data/services/services.yaml
@@ -78,7 +78,7 @@
datacenters:
- eqiad
zotero:
- port: 7231
+ port: 1969
default_values:
pooled: 'no'
weight: 10
diff --git a/hieradata/role/common/aqs.yaml b/hieradata/role/common/aqs.yaml
index d565665..fe4d05a 100644
--- a/hieradata/role/common/aqs.yaml
+++ b/hieradata/role/common/aqs.yaml
@@ -34,6 +34,7 @@
#
# RESTBase for AQS
#
+restbase::port: 7232
restbase::seeds:
- aqs1001.eqiad.wmnet
- aqs1002.eqiad.wmnet
diff --git a/hieradata/role/common/restbase.yaml
b/hieradata/role/common/restbase.yaml
index 48ba4a3..3d0cde3 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -2,6 +2,7 @@
# RESTBase
#
cluster: restbase
+restbase::port: 7231
restbase::logstash_host: logstash1002.eqiad.wmnet
restbase::cassandra_defaultConsistency: localQuorum
restbase::cassandra_localDc: "%{::site}"
diff --git a/manifests/role/aqs.pp b/manifests/role/aqs.pp
index b48835b..24c20a5 100644
--- a/manifests/role/aqs.pp
+++ b/manifests/role/aqs.pp
@@ -75,7 +75,7 @@
ferm::service {'restbase_web':
proto => 'tcp',
- port => '7231',
+ port => $::restbase::port,
}
#TODO: add monitoring once we figure out what metrics we want
diff --git a/modules/restbase/manifests/monitoring.pp
b/modules/restbase/manifests/monitoring.pp
index 1963118..e63d6d3 100644
--- a/modules/restbase/manifests/monitoring.pp
+++ b/modules/restbase/manifests/monitoring.pp
@@ -15,7 +15,7 @@
# Spec checking
require service::monitoring
- $monitor_url = "http://127.0.0.1:7231/${monitor_domain}/v1";
+ $monitor_url = "http://127.0.0.1:${::restbase::port}/${monitor_domain}/v1";
nrpe::monitor_service { 'endpoints_restbase':
description => 'Restbase endpoints health',
nrpe_command => "/usr/local/lib/nagios/plugins/service_checker -t 5
127.0.0.1 ${monitor_url}"
--
To view, visit https://gerrit.wikimedia.org/r/247996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaecb8f6ee5491362100fe32be2b65d755032b27
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
