Fixed wrong value in prometheus startup templates

voxpupuli · Mar 23, 2016 · 0a16901 · 0a16901
1 parent b7550c3
commit 0a16901
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/metadata.json b/metadata.json
@@ -19,5 +19,5 @@
   "source": "https://github.com/brutus333/puppet-prometheus",
   "summary": "Prometheus Puppet module",
   "tags": [],
-  "version": "0.1.6"
+  "version": "0.1.7"
 }
diff --git a/templates/prometheus.debian.erb b/templates/prometheus.debian.erb
@@ -18,7 +18,7 @@ DESC="Prometheus monitoring framework"
 NAME=prometheus
 DAEMON=<%= scope.lookupvar('prometheus::bin_dir') %>/$NAME
 PIDFILE=/var/run/$NAME/$NAME.pid
-DAEMON_ARGS=" -config.file=<%= scope.lookupvar('prometheus::config_dir')+'/prometheus.yaml' %> -storage.local.path=<%= scope.lookupvar('prometheus::params::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %>"
+DAEMON_ARGS=" -config.file=<%= scope.lookupvar('prometheus::config_dir')+'/prometheus.yaml' %> -storage.local.path=<%= scope.lookupvar('prometheus::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %>"
 USER=<%= scope.lookupvar('prometheus::user') %>
 SCRIPTNAME=/etc/init.d/$NAME
 

diff --git a/templates/prometheus.launchd.erb b/templates/prometheus.launchd.erb
@@ -19,7 +19,7 @@
             <string>-config.file=</string>
             <string><%= scope.lookupvar('prometheus::config_dir')+'/prometheus.yaml' %></string>
             <string>-storage.local.path=</string>
-            <string><%= scope.lookupvar('prometheus::params::localstorage')%></string>
+            <string><%= scope.lookupvar('prometheus::localstorage')%></string>
 <% require 'shellwords' %>
 <% for extra_option in Shellwords.split(scope.lookupvar('prometheus::extra_options')) %>
             <string><%= extra_option %></string>

diff --git a/templates/prometheus.sles.erb b/templates/prometheus.sles.erb
@@ -36,7 +36,7 @@ case "$1" in
         echo -n "Starting prometheus "
         ## Start daemon with startproc(8). If this fails
         ## the return value is set appropriately by startproc.
-        startproc $PROMETHEUS_BIN -config.file="$CONFIG_FILE" -storage.local.path=<%= scope.lookupvar('prometheus::params::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %> >> "$LOG_FILE"
+        startproc $PROMETHEUS_BIN -config.file="$CONFIG_FILE" -storage.local.path=<%= scope.lookupvar('prometheus::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %> >> "$LOG_FILE"
 
         # Remember status and be verbose
         rc_status -v

diff --git a/templates/prometheus.systemd.erb b/templates/prometheus.systemd.erb
@@ -8,7 +8,7 @@ User=<%= scope.lookupvar('prometheus::user') %>
 Group=<%= scope.lookupvar('prometheus::group') %>
 ExecStart=<%= scope.lookupvar('prometheus::bin_dir') %>/prometheus \
   -config.file=<%= scope.lookupvar('prometheus::config_dir')+'/prometheus.yaml' %>\
-  -storage.local.path=<%= scope.lookupvar('prometheus::params::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %>
+  -storage.local.path=<%= scope.lookupvar('prometheus::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %>
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure

diff --git a/templates/prometheus.sysv.erb b/templates/prometheus.sysv.erb
@@ -53,7 +53,7 @@ start() {
         daemon --user=<%= scope.lookupvar('prometheus::user') %> \
             --pidfile="$PID_FILE" \
             "$DAEMON" -log.format logger:stdout -config.file="$CONFIG" \
-            -storage.local.path=<%= scope.lookupvar('prometheus::params::localstorage')%> \
+            -storage.local.path=<%= scope.lookupvar('prometheus::localstorage')%> \
             <%= scope.lookupvar('prometheus::extra_options') %> >> "$LOG_FILE" &
         retcode=$?
         mkpidfile

diff --git a/templates/prometheus.upstart.erb b/templates/prometheus.upstart.erb
@@ -23,7 +23,7 @@ script
     [ -e $DEFAULTS ] && . $DEFAULTS
 
     export GOMAXPROCS=${GOMAXPROCS:-2}
-    exec start-stop-daemon -c $USER -g $GROUP -p $PID_FILE -x $PROMETHEUS -S -- -config.file=$CONFIG -storage.local.path=<%= scope.lookupvar('prometheus::params::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %>
+    exec start-stop-daemon -c $USER -g $GROUP -p $PID_FILE -x $PROMETHEUS -S -- -config.file=$CONFIG -storage.local.path=<%= scope.lookupvar('prometheus::localstorage')%> <%= scope.lookupvar('prometheus::extra_options') %>
 end script
 
 respawn