Use iteritems() instead of items().
Signed-off-by: René Jochum <rene@jochums.at>
This commit is contained in:
		
							parent
							
								
									5601d5e2a4
								
							
						
					
					
						commit
						ca15a1fa4e
					
				@ -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 %}
 | 
			
		||||
 | 
			
		||||
@ -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 %}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user