saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

fix(macos): use macos service names

Browse Source 
X
This commit is contained in:
N 2020-06-13 21:23:14 +01:00
parent 6d6e2b9fd4
commit c72b183f5f
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/master.sls
View File

@ -18,12 +18,6 @@ salt-master-macos:
until: True until: True
interval: 10 interval: 10
splay: 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: - require_in:
- service: salt-master - service: salt-master
{%- endif %} {%- endif %}

6
salt/minion.sls
View File

@ -50,12 +50,6 @@ salt-minion-macos:
until: True until: True
interval: 10 interval: 10
splay: 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: - require_in:
- service: salt-minion - service: salt-minion
{%- endif %} {%- endif %}

2
salt/osmap.yaml
View File

@ -57,5 +57,7 @@ SmartOS:
gitfs_provider: dulwich gitfs_provider: dulwich
MacOS: MacOS:
minion_service: com.saltstack.salt.minion
master_service: com.saltstack.salt.master
salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9 salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20 salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20