Yuvipanda has submitted this change and it was merged.
Change subject: citoid: Specify default port for citoid in puppet itself
......................................................................
citoid: Specify default port for citoid in puppet itself
Can be overriden if necessary.
Change-Id: I740139850154d7b7fb0cbe71f62531a3803ba349
---
M hieradata/common/citoid.yaml
M modules/citoid/manifests/init.pp
2 files changed, 3 insertions(+), 6 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/citoid.yaml b/hieradata/common/citoid.yaml
index f450cbb..80c5111 100644
--- a/hieradata/common/citoid.yaml
+++ b/hieradata/common/citoid.yaml
@@ -1,6 +1,3 @@
-port: 1970
http_proxy: url-downloader.wikimedia.org:8080
zotero_host: zotero.svc.eqiad.wmnet
-zotero_port: 1969
statsd_host: statsd.eqiad.wmnet
-statsd_port: 8125
diff --git a/modules/citoid/manifests/init.pp b/modules/citoid/manifests/init.pp
index c215a00..474eda1 100644
--- a/modules/citoid/manifests/init.pp
+++ b/modules/citoid/manifests/init.pp
@@ -23,12 +23,12 @@
# StatsD port. Defaults to 8125.
#
class citoid(
- $port = undef,
+ $port = 1970,
$http_proxy = undef,
+ $zotero_port = 1969,
$zotero_host = undef,
- $zotero_port = undef,
$statsd_host = undef,
- $statsd_port = 8125
+ $statsd_port = 8125,
) {
require_package('nodejs')
--
To view, visit https://gerrit.wikimedia.org/r/197421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I740139850154d7b7fb0cbe71f62531a3803ba349
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
