opendev
/
puppet-nodepool
Code Issues Proposed changes

Merge "Fix variables in nodepool.default.erb template"

This commit is contained in:
Jenkins 2015-08-18 06:14:46 +00:00 committed by Gerrit Code Review
parent f2168cd978 9e37efea4c
commit 2bc4e962b3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/nodepool.default.erb
View File

@ -1,8 +1,8 @@
<% if scope.lookupvar("nodepool::statsd_host") != "" -%>
export STATSD_HOST=<%= scope.lookupvar("nodepool::statsd_host") %>
<% if @statsd_host != "" -%>
export STATSD_HOST=<%= @statsd_host %>
export STATSD_PORT=8125
<% end -%>
<% scope.lookupvar("nodepool::environment").keys.sort.each do |key| -%>
export <%= key %>='<%= scope.lookupvar("nodepool::environment")[key] %>'
<% @environment.keys.sort.each do |key| -%>
export <%= key %>='<%= @environment[key] %>'
<% end -%>
DAEMON_ARGS="-c /etc/nodepool/nodepool.yaml -l /etc/nodepool/logging.conf"