Merge "Revert "Revert "Generate salt minion orchestration config"""
diff --git a/salt/files/_orchestration.conf b/salt/files/_orchestration.conf
new file mode 100644
index 0000000..1668490
--- /dev/null
+++ b/salt/files/_orchestration.conf
@@ -0,0 +1,20 @@
+{%- from "salt/map.jinja" import master with context %}
+{%- if master.enabled %}
+ {%- for environment_name, environment in master.get('environment', {}).iteritems() %}
+ {%- set formulas = environment.get('formula', {}) %}
+ {%- set priorities = {'orchestration':{'deploy':{'applications':{}}}} %}
+ {%- for formula_name, formula in formulas.iteritems() %}
+ {%- if salt['file.file_exists'](master.dir.files+'/'+environment_name+'/'+formula_name+'/meta/salt.yml') %}
+ {%- set orch_fragment_file = formula_name+'/meta/salt.yml' %}
+ {%- macro load_orch_file() %}{% include orch_fragment_file %}{% endmacro %}
+ {%- set orch_yaml = load_orch_file()|load_yaml %}
+ {%- if orch_yaml.orchestration is defined %}
+ {%- do priorities['orchestration']['deploy']['applications'].update({ formula_name: orch_yaml['orchestration']['deploy']['applications'][formula_name] }) %}
+ {%- endif %}
+ {%- endif %}
+ {%- endfor %}
+ {%- if priorities.orchestration.deploy.applications -%}
+{{ priorities|yaml(False) }}
+ {%- endif %}
+ {%- endfor %}
+{%- endif %}
diff --git a/salt/master/minion.sls b/salt/master/minion.sls
index 50fc63e..eab2509 100644
--- a/salt/master/minion.sls
+++ b/salt/master/minion.sls
@@ -4,6 +4,15 @@
include:
- salt.master.service
+/etc/salt/minion.d/_orchestration.conf:
+ file.managed:
+ - source: salt://salt/files/_orchestration.conf
+ - user: root
+ - template: jinja
+ - makedirs: true
+ - require:
+ - {{ master.install_state }}
+
{%- if master.minion is defined %}
/srv/salt/minion_keys: