From c72b183f5ff885b30f0ac0fff8c9a847333a9304 Mon Sep 17 00:00:00 2001
From: N <noel.mcloughlin@gmail.com>
Date: Sat, 13 Jun 2020 21:23:14 +0100
Subject: [PATCH] fix(macos): use macos service names

X
---
 salt/master.sls | 6 ------
 salt/minion.sls | 6 ------
 salt/osmap.yaml | 2 ++
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/salt/master.sls b/salt/master.sls
index ff68a4f..20476c6 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -18,12 +18,6 @@ salt-master-macos:
         until: True
         interval: 10
         splay: 10
-  cmd.run:
-    - names:
-      - launchctl load -w /Library/LaunchDaemons/com.saltstack.salt.master.plist
-      - launchctl unload /Library/LaunchDaemons/com.saltstack.salt.master.plist
-    - require:
-      - file: salt-master-macos
     - require_in:
       - service: salt-master
     {%- endif %}
diff --git a/salt/minion.sls b/salt/minion.sls
index 4ef4ed0..301c74a 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -50,12 +50,6 @@ salt-minion-macos:
         until: True
         interval: 10
         splay: 10
-  cmd.run:
-    - names:
-      - launchctl load -w /Library/LaunchDaemons/com.saltstack.salt.minion.plist
-      - launchctl unload /Library/LaunchDaemons/com.saltstack.salt.minion.plist
-    - require:
-      - file: salt-minion-macos
     - require_in:
       - service: salt-minion
         {%- endif %}
diff --git a/salt/osmap.yaml b/salt/osmap.yaml
index c82cf8c..2224a23 100644
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@@ -57,5 +57,7 @@ SmartOS:
     gitfs_provider: dulwich
 
 MacOS:
+  minion_service: com.saltstack.salt.minion
+  master_service: com.saltstack.salt.master
   salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20