Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-28 00:48:02 +01:00
Code Issues Activity

fix small issues found by @myii

Browse Source
This commit is contained in:
Niels Abspoel 2019-01-26 11:10:44 +01:00
parent 7fdba98802
commit 66c0699814
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/map.jinja
View File

@ -11,11 +11,11 @@
{# merge the osfamilymap #} {# merge the osfamilymap #}
{% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %} {% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %}
{% do defaults.salt.update(osfamily) %} {% do salt['defaults.merge'](defaults['salt'], osfamily) %}
{# merge the osmap #} {# merge the osmap #}
{% set osmap = salt['grains.filter_by'](osmap, grain='os') or{} %} {% set osmap = salt['grains.filter_by'](osmap, grain='os') or{} %}
{% do defaults.salt.update(osmap) %} {% do salt['defaults.merge'](defaults['salt'], osmap) %}
{## Merge in salt pillar ##} {## Merge in salt pillar ##}
{% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %} {% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}

2
salt/osmap.yaml
View File

@ -22,7 +22,7 @@ Ubuntu:
install_from_source: False install_from_source: False
git: git:
require_state: False require_state: False
install_from_package: None install_from_package: Null
Raspbian: Raspbian:
pkgrepo: 'deb http://repo.saltstack.com/apt/{{ os_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb http://repo.saltstack.com/apt/{{ os_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'