Merge pull request #194 from n-rodriguez/wip/fix_fpm_pools

fix(pillar): fix pillar.get still looking under 'ng' namespace

php/cli/ini.sls

@@ -11,10 +11,10 @@
   {% endif %}
 {% endfor %}
 
-{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %}
+{% set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
-{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
+{% if pillar_php_version is iterable and pillar_php_version is not string %}
-  {% for version in pillar_php_ng_version %}
+  {% for version in pillar_php_version %}
-    {% set first_version = pillar_php_ng_version[0]|string %}
+    {% set first_version = pillar_php_version[0]|string %}
     {% set ini = php.lookup.cli.ini|replace(first_version, version) %}
 php_cli_ini_{{ version }}:
   {{ php_ini(ini, php.cli.ini.opts, settings) }}

php/fpm/config.sls

@@ -11,11 +11,11 @@
   {% endif %}
 {% endfor %}
 
-{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %}
+{% set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
-{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
+{% if pillar_php_version is iterable and pillar_php_version is not string %}
-  {% for version in pillar_php_ng_version %}
+  {% for version in pillar_php_version %}
     {% set conf_settings = odict(php.lookup.fpm.defaults) %}
-    {% set first_version = pillar_php_ng_version[0]|string %}
+    {% set first_version = pillar_php_version[0]|string %}
     {% set ini = php.lookup.fpm.ini|replace(first_version, version) %}
     {% set conf = php.lookup.fpm.conf|replace(first_version, version) %}
     {% set pools = php.lookup.fpm.pools|replace(first_version, version) %}

php/fpm/init.sls

@@ -5,13 +5,13 @@ include:
   - php.fpm.service
   - php.fpm.pools
 
-{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %}
+{% set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
 extend:
   php_fpm_service:
     service:
       - watch:
-    {% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
+    {% if pillar_php_version is iterable and pillar_php_version is not string %}
-      {% for version in pillar_php_ng_version %}
+      {% for version in pillar_php_version %}
         - file: php_fpm_ini_config_{{ version }}
         - file: php_fpm_conf_config_{{ version }}
       {% endfor %}
@@ -21,8 +21,8 @@ extend:
     {% endif %}
       - require:
         - sls: php.fpm.config
-  {% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
+  {% if pillar_php_version is iterable and pillar_php_version is not string %}
-    {% for version in pillar_php_ng_version %}
+    {% for version in pillar_php_version %}
   php_fpm_ini_config_{{ version }}:
     file:
       - require:

php/fpm/pools_config.sls

@@ -18,10 +18,10 @@
 {% endfor %}
 {% set state = 'php_fpm_pool_conf_' ~ loop.index0 %}
 
-{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %}
+{% set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
-{% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
+{% if pillar_php_version is iterable and pillar_php_version is not string %}
   {% set first_fpath = path_join(config.get('filename', pool), php.lookup.fpm.pools) %}
-  {% set first_version = pillar_php_ng_version[0]|string %}
+  {% set first_version = pillar_php_version[0]|string %}
   {% set fpath = first_fpath.replace(first_version, config.get('phpversion', '7.0')) %}
 {% else %}
   {% set fpath = path_join(config.get('filename', pool), php.lookup.fpm.pools) %}

php/installed.jinja

@@ -9,16 +9,16 @@
 {% set pkgs = [] %}
 {% set specials = [] %}
 
-{% set pillar_php_ng_version = salt['pillar.get']('php:ng:version', '7.0') %}
+{% set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
 {% if pkginfo is iterable and pkginfo is not string %}
     {% for pkg in pkginfo %}
         {% if pkg is mapping %}
             {% do specials.append(pkg) %}
         {% else %}
             {% do pkgs.append(pkg) %}
-            {% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
+            {% if pillar_php_version is iterable and pillar_php_version is not string %}
-              {% set first_version = pillar_php_ng_version[0]|string %}
+              {% set first_version = pillar_php_version[0]|string %}
-              {% for other_version in pillar_php_ng_version %}
+              {% for other_version in pillar_php_version %}
                 {% set other_version_str = other_version|string %}
                 {% do pkgs.append(pkg.replace(first_version, other_version_str)) %}
               {% endfor %}
@@ -27,9 +27,9 @@
     {% endfor %}
 {% else %}
     {% do pkgs.append(pkginfo) %}
-    {% if pillar_php_ng_version is iterable and pillar_php_ng_version is not string %}
+    {% if pillar_php_version is iterable and pillar_php_version is not string %}
-      {% set first_version = pillar_php_ng_version[0]|string %}
+      {% set first_version = pillar_php_version[0]|string %}
-      {% for other_version in pillar_php_ng_version %}
+      {% for other_version in pillar_php_version %}
         {% set other_version_str = other_version|string %}
         {% do pkgs.append(pkginfo.replace(first_version, other_version_str)) %}
       {% endfor %}