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

Fix: pkgs is undefined

Browse Source 
Update sls files to match name change in map.jinja.
This commit is contained in:
Simon Lloyd 2015-01-11 19:31:05 +01:00
parent 9821a94104
commit cb03e885d4
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/cloud.sls
View File

@ -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

8
salt/master.sls
View File

@ -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

8
salt/minion.sls
View File

@ -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

6
salt/ssh.sls
View File

@ -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:

8
salt/standalone.sls
View File

@ -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

8
salt/syndic.sls
View File

@ -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