Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean-up master.d/f_defaults.conf and add winrepo_provider #251

Merged
merged 3 commits into from
Sep 6, 2016
Merged

Clean-up master.d/f_defaults.conf and add winrepo_provider #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a89d8d9
Add winrepo_provider to master.d/f_defaults.conf
jbouse Sep 4, 2016
79fcda8
Clean up formating of nodegroups
jbouse Sep 4, 2016
4283cba
Add example for winrepo_provider
jbouse Sep 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ salt:
# filter to use for Most other LDAP servers
auth.ldap.filter: {% raw %}'uid={{ username }}'{% endraw %}

# Define winrepo provider, by default support order is pygit2, gitpython
# Set to gitpython for Debian & Ubuntu to get around saltstack/salt#35993
# where pygit2 is not compiled with pygit2.GIT_FEATURE_HTTPS support
winrepo_provider: gitpython

# optional engine configuration
engines:
slack:
Expand Down
22 changes: 14 additions & 8 deletions salt/files/master.d/f_defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,17 +1282,17 @@ log_granular_levels:
#nodegroups:
# group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com'
# group2: 'G@os:Debian and foo.domain.com'
{% if 'nodegroups' in cfg_master %}
{%- if 'nodegroups' in cfg_master %}
nodegroups:
{% for name, lvl in cfg_master['nodegroups'].items() %}
{%- for name, lvl in cfg_master['nodegroups'].items() %}
{{ name }}: {{ lvl }}
{% endfor %}
{% elif 'nodegroups' in cfg_salt %}
{%- endfor %}
{%- elif 'nodegroups' in cfg_salt %}
nodegroups:
{% for name, lvl in cfg_salt['nodegroups'].items() %}
{%- for name, lvl in cfg_salt['nodegroups'].items() %}
{{ name }}: {{ lvl }}
{% endfor %}
{% endif %}
{%- endfor %}
{%- endif %}

##### Range Cluster settings #####
##########################################
Expand All @@ -1304,6 +1304,12 @@ nodegroups:

##### Windows Software Repo settings #####
###########################################
# Specify the provider to be used for git_pillar. Must be either pygit2 or
# gitpython. If unset, then both will be tried in that same order, and the
# first one with a compatible version installed will be the provider that
# is used.
{{ get_config('winrepo_provider', 'pygit2') }}

# Repo settings for 2015.8+ master used with 2015.8+ Windows minions
#
# Location of the repo on the master:
Expand Down Expand Up @@ -1441,4 +1447,4 @@ mongo.{{ name }}: {{ value }}
alternative.mongo.{{ name }}: {{ value }}
{%- endfor %}
{% endif %}
{%- endif %}
{%- endif %}