Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216867
Change subject: graphite: hotname is a fact, qualify in the right scope
......................................................................
graphite: hotname is a fact, qualify in the right scope
bug: T97251
Change-Id: I3a074c0130a2e4f520e192cb026dc5c614ebf4bb
---
M modules/graphite/templates/initscripts/frontend-relay.upstart.erb
M modules/graphite/templates/initscripts/local-relay.upstart.erb
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/216867/1
diff --git a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
index fde487e..2fbffd8 100644
--- a/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/frontend-relay.upstart.erb
@@ -12,4 +12,4 @@
# it is possible there's another carbon-c-relay running on the same host, so
# change the hostname
-exec /usr/bin/carbon-c-relay -H <%= "#{hostname}_frontend" -%> -p 2003 -f
/etc/carbon/frontend-relay.conf
+exec /usr/bin/carbon-c-relay -H <%=
"#{scope.lookupvar('::hostname')}_frontend" -%> -p 2003 -f
/etc/carbon/frontend-relay.conf
diff --git a/modules/graphite/templates/initscripts/local-relay.upstart.erb
b/modules/graphite/templates/initscripts/local-relay.upstart.erb
index 3ca5694..702a865 100644
--- a/modules/graphite/templates/initscripts/local-relay.upstart.erb
+++ b/modules/graphite/templates/initscripts/local-relay.upstart.erb
@@ -12,4 +12,4 @@
# it is possible there's another carbon-c-relay running on the same host, so
# change the hostname
-exec /usr/bin/carbon-c-relay -H <%= "#{hostname}_local" -%> -p 1903 -f
/etc/carbon/local-relay.conf
+exec /usr/bin/carbon-c-relay -H <%= "#{scope.lookupvar('::hostname')}_local"
-%> -p 1903 -f /etc/carbon/local-relay.conf
--
To view, visit https://gerrit.wikimedia.org/r/216867
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a074c0130a2e4f520e192cb026dc5c614ebf4bb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
