saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More MacOS fixes.

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-04-19 13:17:46 -07:00
parent f823932131
commit a3fed785f8
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootstrap-salt.sh
View file

@ -8627,8 +8627,15 @@ install_macosx_git_post() {
install_macosx_restart_daemons() {
[ $_START_DAEMONS -eq $BS_FALSE ] && return
/bin/launchctl unload -w /Library/LaunchDaemons/com.saltstack.salt.minion.plist || return 1
/bin/launchctl load -w /Library/LaunchDaemons/com.saltstack.salt.minion.plist || return 1
if [ "$_INSTALL_MINION" -eq $BS_TRUE ]; then
/bin/launchctl unload -w /Library/LaunchDaemons/com.saltstack.salt.minion.plist || return 1
/bin/launchctl load -w /Library/LaunchDaemons/com.saltstack.salt.minion.plist || return 1
fi
if [ "$_INSTALL_MASTER" -eq $BS_TRUE ]; then
/bin/launchctl unload -w /Library/LaunchDaemons/com.saltstack.salt.master.plist || return 1
/bin/launchctl load -w /Library/LaunchDaemons/com.saltstack.salt.master.plist || return 1
fi
return 0
}

6
kitchen.macos.yml
View file

@ -5,7 +5,6 @@ driver:
provisioner:
sudo: true
salt_bootstrap_options: -MP stable %s
salt_call_command: /opt/salt/bin/salt-call
init_environment: |
echo 'auto_accept: true' > /tmp/auto-accept-keys.conf
sudo mkdir -p /etc/salt/master.d
@ -22,18 +21,23 @@ suites:
- name: stable-3003
provisioner:
salt_version: 3003.4
salt_call_command: /opt/salt/bin/salt-call
- name: stable-3004
provisioner:
salt_version: 3004.1
salt_call_command: /opt/salt/bin/salt-call
- name: stable-3005
provisioner:
salt_version: 3005.1
salt_call_command: /opt/salt/bin/salt-call
- name: stable-3006
provisioner:
salt_version: 3006
salt_call_command: /opt/salt/salt-call
- name: latest
provisioner:
salt_version: latest
salt_call_command: /opt/salt/salt-call
verifier:
command: pytest --cache-clear -v -s -ra --log-cli-level=debug -k "not test_ping" tests/integration/