Skip to content

Commit

Permalink
Allow repo options to be set per repo for gitfs_remotes in pillar
Browse files Browse the repository at this point in the history
  • Loading branch information
@cackovic
cackovic committed Oct 24, 2014
1 parent 2013d4b commit 2b51a6f
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion salt/files/master.d/_defaults.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,19 @@ fileserver_backend:
{% if 'gitfs_remotes' in master -%}
gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %}
- {{ remote }}{% endfor -%}
{% if remote is mapping %}
{%- for repo, children in remote.iteritems() -%}

This comment has been minimized.

Sign in to view

Copy link
@nvx

nvx Nov 14, 2014

The -%} on this line appears to break the yaml whitespace of the following line.
- {{ repo }}:
{%- for child in children %}
{% for key, value in child.iteritems() -%}

This comment has been minimized.

Sign in to view

Copy link
@nvx

nvx Nov 14, 2014

The same issue appears here as well (-%} breaking yaml formatting)
- {{ key }}: {{ value }}
{%- endfor %}
{%- endfor %}
{%- endfor %}
{%- else -%}

This comment has been minimized.

Sign in to view

Copy link
@nvx

nvx Nov 14, 2014

And also here (-%})
- {{ remote }}
{%- endif %}
{%- endfor %}
{%- endif %}
#
#gitfs_remotes:
Expand Down

2 comments on commit 2b51a6f

@cackovic
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that I didn't test this as well as I thought that I did. Can you please paste your input and output?

@nmadhok
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cackovic I have updated the errors. See most recent commit.

Please sign in to comment.