From ca15a1fa4eb43a7f5d22742b2db2bfbf5f08a9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Mon, 13 Jul 2015 16:02:46 +0200 Subject: [PATCH] Use iteritems() instead of items(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: René Jochum --- php/init.sls | 4 ++++ php/ng/fpm/pools_config.sls | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/php/init.sls b/php/init.sls index 1192bce..5389e93 100644 --- a/php/init.sls +++ b/php/init.sls @@ -1,5 +1,7 @@ {% from "php/map.jinja" import php with context %} +{% if not 'ng' in salt['pillar.get']('php', {}) %} + {% if grains['os_family']=="Debian" %} {% set use_ppa = salt['pillar.get']('php:use_ppa', none) %} {% if use_ppa is not none %} @@ -18,3 +20,5 @@ php54: php: pkg.installed: - name: {{ php.php_pkg }} + +{% endif %} diff --git a/php/ng/fpm/pools_config.sls b/php/ng/fpm/pools_config.sls index 80a9d2f..5420578 100644 --- a/php/ng/fpm/pools_config.sls +++ b/php/ng/fpm/pools_config.sls @@ -9,7 +9,7 @@ {% set pool_states = [] %} -{% for pool, config in php.fpm.pools.items() %} +{% for pool, config in php.fpm.pools.iteritems() %} {% set state = 'php_fpm_pool_conf_' ~ loop.index0 %} {% set fpath = path_join(pool, php.lookup.fpm.pools) %} @@ -29,6 +29,3 @@ {% do pool_states.append(state) %} {% endfor %} - - -