From 8479111cbdccf1b558a2aab387b4f62bd510b4d5 Mon Sep 17 00:00:00 2001
From: Devin Christensen <quixoten@gmail.com>
Date: Wed, 17 Jun 2015 09:53:31 -0600
Subject: [PATCH] Fix syndic requisites

The syndic service was depending upon itself, which caused the salt run
to fail. This commit fixes that by depending on the salt-master service
rather than the salt-syndic service. I also made it more general by
using IDs to specify the provider rather than the name, which is a bit
less reliable.
---
 salt/syndic.sls | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/salt/syndic.sls b/salt/syndic.sls
index 9079552..58a9ee0 100644
--- a/salt/syndic.sls
+++ b/salt/syndic.sls
@@ -8,12 +8,11 @@ salt-syndic:
   pkg.installed:
     - name: {{ salt_settings.salt_syndic }}
 {% endif %}
-  service:
-    - running
+  service.running
     - require:
-      - service: {{ salt_settings.syndic_service }}
+      - service: salt-master
     - watch:
 {% if salt_settings.install_packages %}
       - pkg: salt-master
 {% endif %}
-      - file: {{ salt_settings.config_path }}/master
+      - file: salt-master