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

Merge pull request #77 from rhertzog/misc-bugfixes

Browse Source 
FIxes for nodegroups/log_granular_levels settings and small cleanups
This commit is contained in:
Wolodja Wentland 2014-12-24 08:52:29 +01:00
commit 98917adad2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/files/master.d/_defaults.conf
View File

@ -604,10 +604,10 @@ fileserver_backend:
gitfs_remotes: gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %} {%- for remote in master['gitfs_remotes'] %}
{%- if remote is iterable and remote is not string %} {%- if remote is iterable and remote is not string %}
{%- for repo, children in remote.iteritems() %} {%- for repo, children in remote.items() %}
- {{ repo }}: - {{ repo }}:
{%- for child in children %} {%- for child in children %}
{%- for key, value in child.iteritems() %} {%- for key, value in child.items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}
{%- endfor -%} {%- endfor -%}
{%- endfor -%} {%- endfor -%}
@ -860,12 +860,12 @@ peer_run:
# #
{% if 'log_granular_levels' in master %} {% if 'log_granular_levels' in master %}
log_granular_levels: log_granular_levels:
{% for name, lvl in master['log_granular_levels'] %} {% for name, lvl in master['log_granular_levels'].items() %}
{{ name }}: {{ lvl }} {{ name }}: {{ lvl }}
{% endfor %} {% endfor %}
{% elif 'log_granular_levels' in salt %} {% elif 'log_granular_levels' in salt %}
log_granular_levels: log_granular_levels:
{% for name, lvl in salt['log_granular_levels'] %} {% for name, lvl in salt['log_granular_levels'].items() %}
{{ name }}: {{ lvl }} {{ name }}: {{ lvl }}
{% endfor %} {% endfor %}
{% else %} {% else %}
@ -882,12 +882,12 @@ log_granular_levels:
# group2: 'G@os:Debian and foo.domain.com' # group2: 'G@os:Debian and foo.domain.com'
{% if 'nodegroups' in master %} {% if 'nodegroups' in master %}
nodegroups: nodegroups:
{% for name, lvl in master['nodegroups'] %} {% for name, lvl in master['nodegroups'].items() %}
{{ name }}: {{ lvl }} {{ name }}: {{ lvl }}
{% endfor %} {% endfor %}
{% elif 'nodegroups' in salt %} {% elif 'nodegroups' in salt %}
nodegroups: nodegroups:
{% for name, lvl in salt['nodegroups'] %} {% for name, lvl in salt['nodegroups'].items() %}
{{ name }}: {{ lvl }} {{ name }}: {{ lvl }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -933,7 +933,7 @@ win_gitrepos:
##### Halite ##### ##### Halite #####
########################################## ##########################################
halite: halite:
{% for name, value in master['halite'].iteritems() %} {% for name, value in master['halite'].items() %}
{{ name }}: {{ value }} {{ name }}: {{ value }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
@ -942,7 +942,7 @@ halite:
##### rest_cherrypy ##### ##### rest_cherrypy #####
########################################## ##########################################
rest_cherrypy: rest_cherrypy:
{% for name, value in master['rest_cherrypy'].iteritems() %} {% for name, value in master['rest_cherrypy'].items() %}
{{ name }}: {{ value }} {{ name }}: {{ value }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}

4
salt/files/minion.d/_defaults.conf
View File

@ -449,10 +449,10 @@ file_client: local
gitfs_remotes: gitfs_remotes:
{%- for remote in minion['gitfs_remotes'] %} {%- for remote in minion['gitfs_remotes'] %}
{%- if remote is iterable and remote is not string %} {%- if remote is iterable and remote is not string %}
{%- for repo, children in remote.iteritems() %} {%- for repo, children in remote.items() %}
- {{ repo }}: - {{ repo }}:
{%- for child in children %} {%- for child in children %}
{%- for key, value in child.iteritems() %} {%- for key, value in child.items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}
{%- endfor -%} {%- endfor -%}
{%- endfor -%} {%- endfor -%}