commit aaa164d5f57dde988ecf3716e611c64a4f78fcfc
author pasquier-s <spasquier@mirantis.com> Wed Nov 09 10:59:04 2016 +0100
committer GitHub <noreply@github.com> Wed Nov 09 10:59:04 2016 +0100
tree 22af9997c35ad8eceeff186620363c58aafa817a
parent 3ea37027deded19888a538023e89410391570062
parent 866cf06a2a02548d881b8b8864f31ebb01f1d9b0

Merge pull request #6 from simonpasquier/merge-master

Merge master

haproxy/meta/salt.yml

diff --git a/haproxy/meta/salt.yml b/haproxy/meta/salt.yml
new file mode 100644
index 0000000..cf17795
--- /dev/null
+++ b/haproxy/meta/salt.yml
@@ -0,0 +1,4 @@
+orchestrate:
+  proxy:
+    priority: 160 
+

haproxy/orchestrate/init.sls

diff --git a/haproxy/orchestrate/init.sls b/haproxy/orchestrate/init.sls
deleted file mode 100644
index faf3d1c..0000000
--- a/haproxy/orchestrate/init.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-haproxy:
-  salt.state:
-    - tgt: 'roles:haproxy.proxy'
-    - tgt_type: grain
-    - sls: haproxy
-