diff --git a/salt/cloud.sls b/salt/cloud.sls index be62f5d5b2598b80be1904e54011338a08052152..361df4d9b2cd5dee9f88d339281513114f699178 100644 --- a/salt/cloud.sls +++ b/salt/cloud.sls @@ -1,5 +1,5 @@ -{% from "salt/map.jinja" import pkgs with context %} -{% set salt = pillar.get('salt', {}) -%} +{% from "salt/map.jinja" import salt with context %} +{% do salt.update(pillar.get('salt', {})) -%} {% set cloud = salt.get('cloud', {}) -%} python-pip: @@ -24,7 +24,7 @@ apache-libcloud: salt-cloud: pkg.installed: - - name: {{ pkgs['salt-cloud'] }} + - name: {{ salt['salt-cloud'] }} - require: - pip: apache-libcloud - pip: pycrypto diff --git a/salt/master.sls b/salt/master.sls index 2cb3bd040d7f7f579ec86e5eeec4944608b21891..8885a0a2b269b072fb585c350db8f4b161191cea 100644 --- a/salt/master.sls +++ b/salt/master.sls @@ -1,16 +1,16 @@ -{% from "salt/map.jinja" import pkgs with context %} +{% from "salt/map.jinja" import salt with context %} salt-master: pkg.installed: - - name: {{ pkgs['salt-master'] }} + - name: {{ salt['salt-master'] }} file.recurse: - - name: {{ pkgs.get('config-path', '/etc/salt') }}/master.d + - name: {{ salt.get('config-path', '/etc/salt') }}/master.d - template: jinja - source: salt://salt/files/master.d - clean: True service.running: - enable: True - - name: {{ pkgs.get('master-service', 'salt-master') }} + - name: {{ salt.get('master-service', 'salt-master') }} - watch: - pkg: salt-master - file: salt-master diff --git a/salt/minion.sls b/salt/minion.sls index a33172fe72f4680d48e9a02d7d30d16297352fd1..db4958b76b821f6a30c5c9840997d4826b22f102 100644 --- a/salt/minion.sls +++ b/salt/minion.sls @@ -1,10 +1,10 @@ -{% from "salt/map.jinja" import pkgs with context %} +{% from "salt/map.jinja" import salt with context %} salt-minion: pkg.installed: - - name: {{ pkgs['salt-minion'] }} + - name: {{ salt['salt-minion'] }} file.recurse: - - name: {{ pkgs.get('config-path', '/etc/salt') }}/minion.d + - name: {{ salt.get('config-path', '/etc/salt') }}/minion.d - template: jinja - source: salt://salt/files/minion.d - clean: True @@ -12,7 +12,7 @@ salt-minion: standalone: False service.running: - enable: True - - name: {{ pkgs.get('minion-service', 'salt-minion') }} + - name: {{ salt.get('minion-service', 'salt-minion') }} - watch: - pkg: salt-minion - file: salt-minion diff --git a/salt/ssh.sls b/salt/ssh.sls index e32f5ebb240d01997cdf84b97cb63fb716065ac8..411d57f953f2fa683402b9da008fcf4d294091fc 100644 --- a/salt/ssh.sls +++ b/salt/ssh.sls @@ -1,12 +1,12 @@ -{% from "salt/map.jinja" import pkgs with context %} +{% from "salt/map.jinja" import salt with context %} ensure salt-ssh is installed: pkg.installed: - - name: {{ pkgs['salt-ssh'] }} + - name: {{ salt['salt-ssh'] }} ensure roster config: file.managed: - - name: {{ pkgs.get('config_path', '/etc/salt') }}/roster + - name: {{ salt.get('config_path', '/etc/salt') }}/roster - source: salt://salt/files/roster.jinja - template: jinja - require: diff --git a/salt/standalone.sls b/salt/standalone.sls index e4a8cd24fca31272f246553c500682fd52db9b29..aaa20079426a49f28e86d4d9347bdca262347792 100644 --- a/salt/standalone.sls +++ b/salt/standalone.sls @@ -1,10 +1,10 @@ -{% from "salt/map.jinja" import pkgs with context %} +{% from "salt/map.jinja" import salt with context %} salt-minion: pkg.installed: - - name: {{ pkgs['salt-minion'] }} + - name: {{ salt['salt-minion'] }} file.recurse: - - name: {{ pkgs.get('config-path', '/etc/salt') }}/minion.d + - name: {{ salt.get('config-path', '/etc/salt') }}/minion.d - template: jinja - source: salt://salt/files/minion.d - clean: True @@ -12,7 +12,7 @@ salt-minion: standalone: True service.dead: - enable: False - - name: {{ pkgs.get('minion-service', 'salt-minion') }} + - name: {{ salt.get('minion-service', 'salt-minion') }} - require: - pkg: salt-minion - file: salt-minion diff --git a/salt/syndic.sls b/salt/syndic.sls index 5af99e40bc135662a9eb28e4aace8960b30fe3ba..a9ec986b1ed0ceb1cd3b10901e882957f933afc6 100644 --- a/salt/syndic.sls +++ b/salt/syndic.sls @@ -1,15 +1,15 @@ -{% from "salt/map.jinja" import pkgs with context %} +{% from "salt/map.jinja" import salt with context %} include: - salt.master salt-syndic: pkg.installed: - - name: {{ pkgs['salt-syndic'] }} + - name: {{ salt['salt-syndic'] }} service: - running - require: - - service: {{ pkgs.get('syndic-service', 'salt-master') }} + - service: {{ salt.get('syndic-service', 'salt-master') }} - watch: - pkg: salt-master - - file: {{ pkgs.get('config-path', '/etc/salt') }}/master + - file: {{ salt.get('config-path', '/etc/salt') }}/master