saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Fix pillar_roots configuration format in master

Browse Source 
This commit fixes how `pillar_roots` are generated and after this fix the
generated configuration does not contain any unnecessary new lines:

```yaml
pillar_roots:
  base:
     /srv/salt/dir1
  dev:
     /srv/salt/dir2
     /srv/salt/dir3
  locale:
     /srv/salt/dir4
```

Before this commit the pillar_roots in `f_defaults.conf` for master would be
generated with a lot of empty lines in between directories, like this:

```yaml
pillar_roots:

  base:

     /srv/salt/dir1

  dev:

     /srv/salt/dir2

     /srv/salt/dir3

  local:

     /srv/salt/dir4

```

The minion configuration is not affected and renders fine.
This commit is contained in:
Edvinas Klovas 2015-05-16 15:10:36 +03:00
parent b3db6e2a76
commit 47b37f2ffb
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/files/master.d/f_defaults.conf
View File

@ -642,27 +642,27 @@ gitfs_remotes:
# Pillar is laid out in the same fashion as the file server, with environments, # Pillar is laid out in the same fashion as the file server, with environments,
# a top file and sls files. However, pillar data does not need to be in the # a top file and sls files. However, pillar data does not need to be in the
# highstate format, and is generally just key/value pairs. # highstate format, and is generally just key/value pairs.
{% if 'pillar_roots' in cfg_master %} {% if 'pillar_roots' in cfg_master -%}
pillar_roots: pillar_roots:
{% for name, roots in cfg_master['pillar_roots']|dictsort %} {%- for name, roots in cfg_master['pillar_roots']|dictsort %}
{{ name }}: {{ name }}:
{% for dir in roots %} {%- for dir in roots %}
- {{ dir }} - {{ dir }}
{%- endfor -%}
{% endfor %} {% endfor %}
{% endfor %} {%- elif 'pillar_roots' in cfg_salt -%}
{% elif 'pillar_roots' in cfg_salt %}
pillar_roots: pillar_roots:
{% for name, roots in cfg_salt['pillar_roots']|dictsort %} {%- for name, roots in cfg_salt['pillar_roots']|dictsort -%}
{{ name }}: {{ name }}:
{% for dir in roots %} {%- for dir in roots -%}
- {{ dir }} - {{ dir }}
{% endfor %} {%- endfor -%}
{% endfor %} {%- endfor -%}
{% else %} {%- else -%}
#pillar_roots: #pillar_roots:
# base: # base:
# - /srv/pillar # - /srv/pillar
{% endif %} {%- endif -%}
# #
{% if 'ext_pillar' in cfg_master %} {% if 'ext_pillar' in cfg_master %}
ext_pillar: ext_pillar: