Allow to use ordering in dicts
label:
test:
input:
asd:
test: 2
require:
- bsd
bsd:
test: 1
Change-Id: I330778a4d9efa554b55def4251ec948cdced3659
diff --git a/.kitchen.yml b/.kitchen.yml
index e516907..9ef697b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,6 +18,9 @@
- name: linux
repo: git
source: https://github.com/salt-formulas/salt-formula-linux.git
+ - name: salt
+ repo: git
+ source: https://github.com/salt-formulas/salt-formula-salt.git
state_top:
base:
"*":
diff --git a/fluentd/files/filter/_generate.conf b/fluentd/files/filter/_generate.conf
index aaee7e9..338c4e2 100644
--- a/fluentd/files/filter/_generate.conf
+++ b/fluentd/files/filter/_generate.conf
@@ -1,4 +1,4 @@
-{%- for name, values in values.iteritems() %}
+{%- for name, values in salt['modelutils.order_by_requisites'](values).iteritems() %}
{%- if values.get('enabled', True) %}
# Filter {{ name }}
{% include 'fluentd/files/filter/' + values.get('type') + '.conf' %}
diff --git a/fluentd/files/input/_generate.conf b/fluentd/files/input/_generate.conf
index 17e6b13..62ca096 100644
--- a/fluentd/files/input/_generate.conf
+++ b/fluentd/files/input/_generate.conf
@@ -1,4 +1,4 @@
-{%- for name, values in values.iteritems() %}
+{%- for name, values in salt['modelutils.order_by_requisites'](values).iteritems() %}
{%- if values.get('enabled', True) %}
# Input {{ name }}
{% include ['fluentd/files/input/' + values.get('type') + '.conf', 'fluentd/files/input/generic.conf'] %}
diff --git a/fluentd/files/match/_generate.conf b/fluentd/files/match/_generate.conf
index 8cf9579..4ebcbae 100644
--- a/fluentd/files/match/_generate.conf
+++ b/fluentd/files/match/_generate.conf
@@ -1,4 +1,4 @@
-{%- for name, values in values.iteritems() %}
+{%- for name, values in salt['modelutils.order_by_requisites'](values).iteritems() %}
{%- if values.get('enabled', True) %}
# Output {{ name }}
{% include 'fluentd/files/match/' + values.get('type') + '.conf' %}
diff --git a/metadata.yml b/metadata.yml
index da0562d..01b4ee2 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,6 @@
name: "fluentd"
version: "1.0"
source: "https://github.com/salt-formulas/salt-formula-fluentd"
+dependencies:
+- name: salt
+ source: "https://github.com/salt-formulas/salt-formula-salt"