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

Merge pull request #81 from aboe76/use_lookup_map.jinja

Browse Source 
Removed package_map lookup
This commit is contained in:
Seth House 2015-01-10 18:44:02 -07:00
commit 77522d6e56
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/cloud.sls
View File

@ -1,4 +1,4 @@
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
{% set salt = pillar.get('salt', {}) -%}
{% set cloud = salt.get('cloud', {}) -%}

13
salt/package-map.jinja → salt/map.jinja
View File

@ -1,4 +1,4 @@
{% set package_table = {
{% set pkgs = salt['grains.filter_by']({
'Debian': {'salt-master': 'salt-master',
'salt-minion': 'salt-minion',
'salt-syndic': 'salt-syndic',
@ -48,11 +48,6 @@
'config-path': '/usr/local/etc/salt',
'minion-service': 'salt_minion',
'master-service': 'salt_master',
'syndic-service': 'salt_syndic'}
} %}
{% if 'package_table' in pillar %}
{% set pkgs = pillar['package_table'] %}
{% elif grains['os'] in package_table %}
{% set pkgs = package_table[grains['os']] %}
{% endif %}
'syndic-service': 'salt_syndic'},
},
merge=salt['pillar.get']('salt:lookup'), base='default') %}

2
salt/master.sls
View File

@ -1,4 +1,4 @@
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
salt-master:
pkg.installed:

2
salt/minion.sls
View File

@ -1,4 +1,4 @@
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
salt-minion:
pkg.installed:

2
salt/ssh.sls
View File

@ -1,4 +1,4 @@
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
ensure salt-ssh is installed:
pkg.installed:

2
salt/standalone.sls
View File

@ -1,4 +1,4 @@
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
salt-minion:
pkg.installed:

2
salt/syndic.sls
View File

@ -1,4 +1,4 @@
{% from "salt/package-map.jinja" import pkgs with context %}
{% from "salt/map.jinja" import pkgs with context %}
include:
- salt.master