Browse Source

Pillar from salt, tests metadata

tags/0.4
Ales Komarek 9 years ago
parent
commit
9bc205c5ae
3 changed files with 17 additions and 3 deletions
  1. +5
    -3
      salt/master/pillar.sls
  2. +6
    -0
      tests/pillar/master_single.sls
  3. +6
    -0
      tests/pillar/minion_local.sls

+ 5
- 3
salt/master/pillar.sls View File

- file: /srv/salt/env - file: /srv/salt/env
- pkg: git_packages - pkg: git_packages


{%- if master.system is defined %}

/srv/salt/env/{{ master.system.environment }}/top.sls: /srv/salt/env/{{ master.system.environment }}/top.sls:
file.symlink: file.symlink:
- target: /srv/salt/pillar/files_top.sls - target: /srv/salt/pillar/files_top.sls
- require: - require:
- file: /srv/salt/env/{{ master.system.environment }} - file: /srv/salt/env/{{ master.system.environment }}


{%- endif %}

{%- elif master.pillar.engine == 'reclass' %} {%- elif master.pillar.engine == 'reclass' %}


include: include:
/srv/salt/reclass/classes/service: /srv/salt/reclass/classes/service:
file.directory file.directory



{%- if master.system is defined %} {%- if master.system is defined %}


{%- for formula_name, formula in master.system.get('formula', {}).iteritems() %} {%- for formula_name, formula in master.system.get('formula', {}).iteritems() %}


{%- endfor %} {%- endfor %}


{%-endif %}

{%- endif %}


{%- endif %} {%- endif %}



+ 6
- 0
tests/pillar/master_single.sls View File

command_timeout: 5 command_timeout: 5
worker_threads: 2 worker_threads: 2
base_environment: prd base_environment: prd
pillar:
engine: salt
source:
engine: git
address: 'git@repo.domain.com:salt/pillar-demo.git'
branch: 'master'
environment: environment:
prd: prd:
formula: formula:

+ 6
- 0
tests/pillar/minion_local.sls View File

minion: minion:
enabled: true enabled: true
local: true local: true
pillar:
engine: salt
source:
engine: git
address: 'git@repo.domain.com:salt/pillar-demo.git'
branch: 'master'

Loading…
Cancel
Save