Pillar from salt, tests metadata
diff --git a/salt/master/pillar.sls b/salt/master/pillar.sls
index c7be5d5..65fc1a5 100644
--- a/salt/master/pillar.sls
+++ b/salt/master/pillar.sls
@@ -15,12 +15,16 @@
- file: /srv/salt/env
- pkg: git_packages
+{%- if master.system is defined %}
+
/srv/salt/env/{{ master.system.environment }}/top.sls:
file.symlink:
- target: /srv/salt/pillar/files_top.sls
- require:
- file: /srv/salt/env/{{ master.system.environment }}
+{%- endif %}
+
{%- elif master.pillar.engine == 'reclass' %}
include:
@@ -29,7 +33,6 @@
/srv/salt/reclass/classes/service:
file.directory
-
{%- if master.system is defined %}
{%- for formula_name, formula in master.system.get('formula', {}).iteritems() %}
@@ -68,8 +71,7 @@
{%- endfor %}
-{%-endif %}
-
+{%- endif %}
{%- endif %}
diff --git a/tests/pillar/master_single.sls b/tests/pillar/master_single.sls
index 416c461..62f9fd3 100644
--- a/tests/pillar/master_single.sls
+++ b/tests/pillar/master_single.sls
@@ -10,6 +10,12 @@
command_timeout: 5
worker_threads: 2
base_environment: prd
+ pillar:
+ engine: salt
+ source:
+ engine: git
+ address: 'git@repo.domain.com:salt/pillar-demo.git'
+ branch: 'master'
environment:
prd:
formula:
diff --git a/tests/pillar/minion_local.sls b/tests/pillar/minion_local.sls
index 5ec6124..9e3168f 100644
--- a/tests/pillar/minion_local.sls
+++ b/tests/pillar/minion_local.sls
@@ -2,3 +2,9 @@
minion:
enabled: true
local: true
+ pillar:
+ engine: salt
+ source:
+ engine: git
+ address: 'git@repo.domain.com:salt/pillar-demo.git'
+ branch: 'master'
\ No newline at end of file