refactor(pillar): namespace defaults to meta-state name

This might be useful if one wants to use this formula with a (renamed)
fork within the same environment.

Note this also permits to override pillar namespace by defining
'{meta-state name}:pillar:namespace: str'.

Author: faudebert

nginx/certificates.sls

@@ -1,5 +1,5 @@
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- from tplroot ~ '/map.jinja' import nginx with context %}
+{%- from tplroot ~ '/map.jinja' import nginx, pillar_namespace with context %}
 
 include:
   - {{ tplroot }}.service
@@ -14,7 +14,7 @@ prepare_certificates_path_dir:
 create_nginx_dhparam_{{ dh_param }}_key:
   file.managed:
     - name: {{ nginx.certificates_path }}/{{ dh_param }}
-    - contents_pillar: nginx:dh_param:{{ dh_param }}
+    - contents_pillar: {{ pillar_namespace }}:dh_param:{{ dh_param }}
     - makedirs: True
     - require:
       - file: prepare_certificates_path_dir
@@ -44,7 +44,7 @@ nginx_{{ domain }}_ssl_certificate:
 {% if domain in nginx.certificates and 'public_cert_pillar' in nginx.certificates[domain] %}
     - contents_pillar: {{ nginx.certificates[domain].public_cert_pillar }}
 {% else %}
-    - contents_pillar: nginx:certificates:{{ domain }}:public_cert
+    - contents_pillar: {{ pillar_namespace }}:certificates:{{ domain }}:public_cert
 {% endif %}
     - watch_in:
       - service: nginx_service
@@ -58,7 +58,7 @@ nginx_{{ domain }}_ssl_key:
 {% if 'private_key_pillar' in nginx.certificates[domain] %}
     - contents_pillar: {{ nginx.certificates[domain].private_key_pillar }}
 {% else %}
-    - contents_pillar: nginx:certificates:{{ domain }}:private_key
+    - contents_pillar: {{ pillar_namespace }}:certificates:{{ domain }}:private_key
 {% endif %}
     - watch_in:
       - service: nginx_service

nginx/map.jinja

@@ -4,7 +4,9 @@
     {% endfor %}
 {% endmacro %}
 
-{% set nginx = salt['pillar.get']('nginx', {
+{%- set tplroot = tpldir.split('/')[0] %}
+{% set pillar_namespace = salt['pillar.get']('{}:pillar:namespace'.format(tplroot), tplroot) %}
+{% set nginx = salt['pillar.get'](pillar_namespace, {
     'lookup': salt['grains.filter_by']({
         'Debian': {
             'package': 'nginx',

pillar.example

@@ -357,3 +357,7 @@ nginx:
         - alt_nginx.service
       nginx_snippet_file_managed:
         - alt_server.conf
+
+  # Configure formula pillar namespace
+  pillar:
+    namespace: nginx