Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

pillar example is incorrect; map.jinja incorrectly names package for windows

This commit is contained in:
Colin Stubbs 2018-01-06 22:21:02 +10:00
parent 8268d83dbe
commit 996aa78a8b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pillar.example
View File

@ -16,11 +16,11 @@ salt:
# to overwrite map.jinja salt packages # to overwrite map.jinja salt packages
lookup: lookup:
salt-master: 'salt-master' salt_master: 'salt-master'
salt-minion: 'salt-minion' salt_minion: 'salt-minion'
salt-syndic: 'salt-syndic' salt_syndic: 'salt-syndic'
salt-cloud: 'salt-cloud' salt_cloud: 'salt-cloud'
salt-ssh: 'salt-ssh' salt_ssh: 'salt-ssh'
pyinotify: 'python-pyinotify' the package to be installed for pyinotify pyinotify: 'python-pyinotify' the package to be installed for pyinotify
# Set which release of SaltStack to use, default to 'latest' # Set which release of SaltStack to use, default to 'latest'

8
salt/map.jinja
View File

@ -2,8 +2,8 @@
# vim: ft=jinja # vim: ft=jinja
{%- macro deep_merge(a, b) %} {%- macro deep_merge(a, b) %}
{#- This whole `'dict' in x.__class__.__name__` mess is a {#- This whole `'dict' in x.__class__.__name__` mess is a
workaround for the missing mapping test in CentOS 6's workaround for the missing mapping test in CentOS 6's
ancient Jinja2, see #193 #} ancient Jinja2, see #193 #}
{%- for k,v in b.items() %} {%- for k,v in b.items() %}
{%- if v is string or v is number %} {%- if v is string or v is number %}
@ -11,7 +11,7 @@
{%- elif 'dict' not in v.__class__.__name__ %} {%- elif 'dict' not in v.__class__.__name__ %}
{%- if a[k] is not defined %} {%- if a[k] is not defined %}
{%- do a.update({ k: v }) %} {%- do a.update({ k: v }) %}
{%- elif a[k] is iterable and 'dict' not in a[k].__class__.__name__ and {%- elif a[k] is iterable and 'dict' not in a[k].__class__.__name__ and
a[k] is not string %} a[k] is not string %}
{%- do a.update({ k: v|list + a[k]|list}) %} {%- do a.update({ k: v|list + a[k]|list}) %}
{%- else %} {%- else %}
@ -156,7 +156,7 @@ that differ from whats in defaults.yaml
'python_git': 'py-GitPython', 'python_git': 'py-GitPython',
}, },
'Windows': { 'Windows': {
'salt_minion': 'saltstack.minion', 'salt_minion': 'salt-minion',
'config_path': 'C:\salt\conf', 'config_path': 'C:\salt\conf',
'minion_service': 'salt-minion', 'minion_service': 'salt-minion',
}, },