From e730dc89896ea89d9475c044f11b1e63ad6585fb Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Jan 2015 09:08:21 +0800 Subject: [PATCH] add return support lookup --- logrotate/jobs.sls | 3 ++- logrotate/map.jinja | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/logrotate/jobs.sls b/logrotate/jobs.sls index b9609d9..e11483d 100644 --- a/logrotate/jobs.sls +++ b/logrotate/jobs.sls @@ -1,5 +1,6 @@ # vim: sts=2 ts=2 sw=2 et ai {% from "logrotate/map.jinja" import logrotate with context %} +{% set jobs = salt['pillar.get']('logrotate:jobs') %} include: - logrotate @@ -14,7 +15,7 @@ logrotate_directory: - require: - pkg: logrotate -{% for key,value in logrotate.jobs.iteritems() %} +{% for key,value in jobs.iteritems() %} {{key}}: file.managed: - name: {{ logrotate.include_dir }}/{{ key.split("/")[-1] }} diff --git a/logrotate/map.jinja b/logrotate/map.jinja index 7a504cf..683ae43 100644 --- a/logrotate/map.jinja +++ b/logrotate/map.jinja @@ -23,4 +23,4 @@ 'user' : 'root', 'group' : 'root', }, -}, merge=salt['pillar.get']('logrotate')) %} +}, merge=salt['pillar.get']('logrotate:lookup')) %}