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

Test if individual gitfs remote is string

Browse Source 
https://github.com/saltstack-formulas/salt-formula/issues/64

Fixes issue where a gitfs remote that has no child options would cause an
error. Also fix up bad yaml in pillar example.
This commit is contained in:
Tiru Srikantha 2014-11-12 20:32:43 -08:00
parent 570b45a9ef
commit 70b5c981fa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pillar.example
View File

@ -4,7 +4,7 @@ salt:
- git - git
- roots - roots
gitfs_remotes: gitfs_remotes:
- git://github.com/saltstack-formulas/salt-formula.git - git://github.com/saltstack-formulas/salt-formula.git:
- base: develop - base: develop
file_roots: file_roots:
base: base:

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

@ -486,7 +486,7 @@ fileserver_backend:
{% if 'gitfs_remotes' in master -%} {% if 'gitfs_remotes' in master -%}
gitfs_remotes: gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %} {%- for remote in master['gitfs_remotes'] %}
{% if remote is iterable %} {% if remote is iterable and remote is not string %}
{%- for repo, children in remote.iteritems() -%} {%- for repo, children in remote.iteritems() -%}
- {{ repo }}: - {{ repo }}:
{%- for child in children %} {%- for child in children %}