Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite: fix hostname lookup for systemd carbon-c-relay units
......................................................................
graphite: fix hostname lookup for systemd carbon-c-relay units
Currently @hostname gets expanded to graphite.wikimedia.org which is obviously
wrong, the local hostname is needed here. Match what's being done for upstart.
Change-Id: I789019c1125d48885aabf059783f2519118cb315
---
M modules/graphite/templates/initscripts/frontend-relay.systemd.erb
M modules/graphite/templates/initscripts/local-relay.systemd.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/graphite/templates/initscripts/frontend-relay.systemd.erb
b/modules/graphite/templates/initscripts/frontend-relay.systemd.erb
index 7c7a26c..3c9e290 100644
--- a/modules/graphite/templates/initscripts/frontend-relay.systemd.erb
+++ b/modules/graphite/templates/initscripts/frontend-relay.systemd.erb
@@ -4,7 +4,7 @@
[Service]
User=carbon-c-relay
-ExecStart=/usr/bin/carbon-c-relay -H <%= "#{@hostname}_frontend" -%> -p 2003
-f /etc/carbon/frontend-relay.conf
+ExecStart=/usr/bin/carbon-c-relay -H <%=
"#{scope.lookupvar('::hostname')}_frontend" -%> -p 2003 -f
/etc/carbon/frontend-relay.conf
[Install]
WantedBy=carbon.service
diff --git a/modules/graphite/templates/initscripts/local-relay.systemd.erb
b/modules/graphite/templates/initscripts/local-relay.systemd.erb
index 3a9ab38..81f0738 100644
--- a/modules/graphite/templates/initscripts/local-relay.systemd.erb
+++ b/modules/graphite/templates/initscripts/local-relay.systemd.erb
@@ -4,7 +4,7 @@
[Service]
User=carbon-c-relay
-ExecStart=/usr/bin/carbon-c-relay -H <%= "#{@hostname}_local" -%> -p 1903 -f
/etc/carbon/local-relay.conf
+ExecStart=/usr/bin/carbon-c-relay -H <%=
"#{scope.lookupvar('::hostname')}_local" -%> -p 1903 -f
/etc/carbon/local-relay.conf
[Install]
WantedBy=carbon.service
--
To view, visit https://gerrit.wikimedia.org/r/305650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I789019c1125d48885aabf059783f2519118cb315
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
