2
0

Merge pull request #447 from noelmcloughlin/macos

feat(macos): basic launchctl service support (WIP)
This commit is contained in:
N 2020-07-15 11:42:53 +01:00 committed by GitHub
commit 497fbdda16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 113 additions and 68 deletions

View File

@ -41,6 +41,8 @@ salt:
salt_master: salt-master salt_master: salt-master
salt_minion: salt-minion salt_minion: salt-minion
salt_master_macos_plist_hash: ''
salt_minion_macos_plist_hash: ''
salt_syndic: salt-syndic salt_syndic: salt-syndic
salt_cloud: salt-cloud salt_cloud: salt-cloud
salt_api: salt-api salt_api: salt-api

View File

@ -7,20 +7,35 @@ include:
- .pin - .pin
{% endif %} {% endif %}
{%- if grains.os == 'MacOS' %}
salt-master-macos:
file.managed:
- name: /Library/LaunchDaemons/com.saltstack.salt.master.plist
- source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist
- source_hash: {{ salt_settings.salt_master_macos_plist_hash }}
- retry:
attempts: 2
until: True
interval: 10
splay: 10
- require_in:
- service: salt-master
{%- endif %}
salt-master: salt-master:
{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
pkg.installed: pkg.installed:
- name: {{ salt_settings.salt_master }} - name: {{ salt_settings.salt_master }}
{%- if salt_settings.version is defined %} {%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }} - version: {{ salt_settings.version }}
{%- endif %} {%- endif %}
{% if salt_settings.master_service_details.state != 'ignore' %} {% if salt_settings.master_service_details.state != 'ignore' %}
- require_in: - require_in:
- service: salt-master - service: salt-master
- watch_in: - watch_in:
- service: salt-master - service: salt-master
{% endif %} {% endif %}
{% endif %} {% endif %}
file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/master.d - name: {{ salt_settings.config_path }}/master.d
{%- if salt_settings.master_config_use_TOFS %} {%- if salt_settings.master_config_use_TOFS %}
@ -35,19 +50,20 @@ salt-master:
{%- endif %} {%- endif %}
- clean: {{ salt_settings.clean_config_d_dir }} - clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _* - exclude_pat: _*
{% if salt_settings.master_service_details.state != 'ignore' %} {% if salt_settings.master_service_details.state != 'ignore' %}
service.{{ salt_settings.master_service_details.state }}: service.{{ salt_settings.master_service_details.state }}:
- enable: {{ salt_settings.master_service_details.enabled }} - enable: {{ salt_settings.master_service_details.enabled }}
- name: {{ salt_settings.master_service }} - name: {{ salt_settings.master_service }}
- watch: - watch:
- file: salt-master-macos
- file: salt-master - file: salt-master
- file: remove-old-master-conf-file - file: remove-old-master-conf-file
{% endif %} {% endif %}
{% if salt_settings.master_remove_config %} {% if salt_settings.master_remove_config %}
remove-default-master-conf-file: remove-default-master-conf-file:
file.absent: file.absent:
- name: {{ salt_settings.config_path }}/master - name: {{ salt_settings.config_path }}/master
{% endif %} {% endif %}
# clean up old _defaults.conf file if they have it around # clean up old _defaults.conf file if they have it around
remove-old-master-conf-file: remove-old-master-conf-file:

View File

@ -7,11 +7,11 @@ include:
- .pin - .pin
{% endif %} {% endif %}
{% if salt_settings.install_packages and grains.os == 'MacOS' %} {%- if grains.os == 'MacOS' %}
{% if salt_settings.install_packages %}
download-salt-minion: download-salt-minion:
{% if salt_settings.salt_minion_pkg_source %} {% if salt_settings.salt_minion_pkg_source %} {# minion upgrade? #}
{# only download IF we know where to get the pkg from and what version to check the current install (if installed) against #}
{# e.g. don't download unless it appears as though we're about to try and upgrade the minion #}
file.managed: file.managed:
- name: '/tmp/salt.pkg' - name: '/tmp/salt.pkg'
- source: {{ salt_settings.salt_minion_pkg_source }} - source: {{ salt_settings.salt_minion_pkg_source }}
@ -27,29 +27,48 @@ download-salt-minion:
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*' - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
- require_in: - require_in:
- macpackage: salt-minion - macpackage: salt-minion
- retry:
attempts: 2
until: True
interval: 10
splay: 10
{%- elif "workaround https://github.com/saltstack/salt/issues/49348" %} {%- elif "workaround https://github.com/saltstack/salt/issues/49348" %}
cmd.run: cmd.run:
- name: /usr/local/bin/brew install {{ salt_settings.salt_minion }} - name: /usr/local/bin/brew install {{ salt_settings.salt_minion }}
- onlyif: test -x /usr/local/bin/brew - onlyif: test -x /usr/local/bin/brew
- runas: {{ salt_settings.rootuser }} - runas: {{ salt_settings.rootuser }}
{%- endif %} {%- endif %}
{% endif %}
salt-minion-macos:
file.managed:
- onlyif: {{ grains.os == 'MacOS' }}
- name: /Library/LaunchDaemons/com.saltstack.salt.minion.plist
- source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist
- source_hash: {{ salt_settings.salt_minion_macos_plist_hash }}
- retry:
attempts: 2
until: True
interval: 10
splay: 10
- require_in:
- service: salt-minion
{%- endif %}
{%- endif %}
salt-minion: salt-minion:
{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %} {%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
macpackage.installed: macpackage.installed:
- name: '/tmp/salt.pkg' - name: '/tmp/salt.pkg'
- target: / - target: /
{# macpackage.installed behaves weirdly with version_check; version_check detects difference but fails to actually complete install. #} {# macpackage.installed is weird with version_check, detects diff but incomplete install #}
{# use force == True as workaround #} - force: True {# workaround #}
- force: True
- unless: - unless:
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*' - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
{% if salt_settings.minion_service_details.state != 'ignore' %} {% if salt_settings.minion_service_details.state != 'ignore' %}
- require_in: - require_in:
- service: salt-minion - service: salt-minion
{% endif %} {% endif %}
- onchanges_in: - onchanges_in:
- cmd: remove-macpackage-salt - cmd: remove-macpackage-salt
{%- elif grains.os != 'MacOS' and "workaround https://github.com/saltstack/salt/issues/49348" %} {%- elif grains.os != 'MacOS' and "workaround https://github.com/saltstack/salt/issues/49348" %}
@ -58,12 +77,12 @@ salt-minion:
{%- if salt_settings.version %} {%- if salt_settings.version %}
- version: {{ salt_settings.version }} - version: {{ salt_settings.version }}
{%- endif %} {%- endif %}
{% if salt_settings.minion_service_details.state != 'ignore' %} {% if salt_settings.minion_service_details.state != 'ignore' %}
- require_in: - require_in:
- service: salt-minion - service: salt-minion
{% endif %} {% endif %}
{%- endif %} {%- endif %}
{% endif %} {% endif %}
file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d
{%- if salt_settings.minion_config_use_TOFS %} {%- if salt_settings.minion_config_use_TOFS %}
@ -80,14 +99,16 @@ salt-minion:
{%- endif %} {%- endif %}
- clean: {{ salt_settings.clean_config_d_dir }} - clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _* - exclude_pat: _*
{% if salt_settings.minion_service_details.state != 'ignore' %} {% if salt_settings.minion_service_details.state != 'ignore' %}
service.{{ salt_settings.minion_service_details.state }}: service.{{ salt_settings.minion_service_details.state }}:
- enable: {{ salt_settings.minion_service_details.enabled }} - enable: {{ salt_settings.minion_service_details.enabled }}
- name: {{ salt_settings.minion_service }} - name: {{ salt_settings.minion_service }}
- require: - watch:
- file: salt-minion - file: salt-master-macos
{% endif %} - file: salt-master
{%- if not salt_settings.restart_via_at %} - file: remove-old-minion-conf-file
{% endif %}
{%- if not salt_settings.restart_via_at %}
cmd.run: cmd.run:
{%- if grains['saltversioninfo'] >= [ 2016, 3 ] %} {%- if grains['saltversioninfo'] >= [ 2016, 3 ] %}
{%- if grains['kernel'] == 'Windows' %} {%- if grains['kernel'] == 'Windows' %}
@ -120,7 +141,7 @@ salt-minion:
{%- endif %} {%- endif %}
- file: salt-minion - file: salt-minion
- file: remove-old-minion-conf-file - file: remove-old-minion-conf-file
{%- else %} {%- else %}
{% if grains.os_family not in ['MacOS', 'FreeBSD'] %} {% if grains.os_family not in ['MacOS', 'FreeBSD'] %}
{# MacOS and FreeBSD have the 'at' command; but there's no package to install #} {# MacOS and FreeBSD have the 'at' command; but there's no package to install #}
@ -145,9 +166,9 @@ restart-salt-minion:
{%- endif %} {%- endif %}
- file: salt-minion - file: salt-minion
- file: remove-old-minion-conf-file - file: remove-old-minion-conf-file
{%- endif %} {%- endif %}
{% if 'inotify' in salt_settings.get('minion', {}).get('beacons', {}) and salt_settings.get('pyinotify', False) %} {% if 'inotify' in salt_settings.get('minion', {}).get('beacons', {}) and salt_settings.get('pyinotify', False) %}
salt-minion-beacon-inotify: salt-minion-beacon-inotify:
pkg.installed: pkg.installed:
- name: {{ salt_settings.pyinotify }} - name: {{ salt_settings.pyinotify }}
@ -155,22 +176,22 @@ salt-minion-beacon-inotify:
- service: salt-minion - service: salt-minion
- watch_in: - watch_in:
- service: salt-minion - service: salt-minion
{% endif %} {% endif %}
{% if salt_settings.minion_remove_config %} {% if salt_settings.minion_remove_config %}
remove-default-minion-conf-file: remove-default-minion-conf-file:
file.absent: file.absent:
- name: {{ salt_settings.config_path }}/minion - name: {{ salt_settings.config_path }}/minion
{% endif %} {% endif %}
# clean up old _defaults.conf file if they have it around # clean up old _defaults.conf file if they have it around
remove-old-minion-conf-file: remove-old-minion-conf-file:
file.absent: file.absent:
- name: {{ salt_settings.config_path }}/minion.d/_defaults.conf - name: {{ salt_settings.config_path }}/minion.d/_defaults.conf
{% if grains.os == 'MacOS' %} {% if grains.os == 'MacOS' %}
remove-macpackage-salt: remove-macpackage-salt:
file.absent: file.absent:
- name: /tmp/salt.pkg - name: /tmp/salt.pkg
- force: True - force: True
{% endif %} {% endif %}

View File

@ -55,3 +55,9 @@ SmartOS:
config_path: /opt/local/etc/salt config_path: /opt/local/etc/salt
master: master:
gitfs_provider: dulwich 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