Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity
salt-formula/salt/master.sls

51 lines
1.6 KiB
Plaintext
Raw Normal View History

feat(`tofs`): allow TOFS for master configuration
2019-06-07 04:54:24 +02:00
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import salt_settings with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
Isolated package mapping and some fixes Moved package_table to it's own file, imported by sls files Moved minion package under watch Fixed some template mistakes I made
2013-08-14 21:53:29 +02:00
Start on salt formula
2013-06-13 01:53:26 +02:00
salt-master:
Add setting to not install packages If you are installing Salt via git/pip, the formula will try to overwrite your install with packaged versions. This setting makes it possible to avoid that.
2015-03-24 18:08:08 +01:00
{% if salt_settings.install_packages %}
Start on salt formula
2013-06-13 01:53:26 +02:00
pkg.installed:
Don't overwrite salt variable Using a variable named salt is a bad idea when salt already has a variable named salt.
2015-03-17 05:39:32 +01:00
- name: {{ salt_settings.salt_master }}
Add configuration for packages version
2018-02-01 11:13:55 +01:00
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
feat(mapping): better control of the service's state Instead of the default service.running + enabled, you can control the actual state, via pillar. And you can even say 'state = ignore' and no state will be generated to control the service
2020-02-17 15:20:33 +01:00
{% if salt_settings.master_service_details.state != 'ignore' %}
Specify dependencies
2019-03-31 18:02:13 +02:00
- require_in:
- service: salt-master
- watch_in:
- service: salt-master
feat(mapping): better control of the service's state Instead of the default service.running + enabled, you can control the actual state, via pillar. And you can even say 'state = ignore' and no state will be generated to control the service
2020-02-17 15:20:33 +01:00
{% endif %}
Add setting to not install packages If you are installing Salt via git/pip, the formula will try to overwrite your install with packaged versions. This setting makes it possible to avoid that.
2015-03-24 18:08:08 +01:00
{% endif %}
Added recursive management of minion.d and master.d. This allows users to easily add configuration settings that the formula doesn't yet provide, without having to modify the existing templates.
2014-10-06 17:17:43 +02:00
file.recurse:
Don't overwrite salt variable Using a variable named salt is a bad idea when salt already has a variable named salt.
2015-03-17 05:39:32 +01:00
- name: {{ salt_settings.config_path }}/master.d
feat(`tofs`): allow TOFS for master configuration
2019-06-07 04:54:24 +02:00
{%- if salt_settings.master_config_use_TOFS %}
- template: ''
- source: {{ files_switch(['master.d'],
lookup='salt-master'
)
}}
{%- else %}
Start on salt formula
2013-06-13 01:53:26 +02:00
- template: jinja
fix(tpl_path): replace slspath to tplroot
2020-02-12 05:49:22 +01:00
- source: salt://{{ tplroot }}/files/master.d
feat(`tofs`): allow TOFS for master configuration
2019-06-07 04:54:24 +02:00
{%- endif %}
Stop using clean: True on /etc/salt/{minion,master}.d New versions of Salt put config files in /etc/salt/{minion,master}.d. We don't want to erase them by using a clean: True on the file.recurse. This is a backward incompatible change, but it's necessary to avoid deleting Salt config files. Resolves #104
2015-03-23 22:53:24 +01:00
- clean: {{ salt_settings.clean_config_d_dir }}
Switch config file.recurse to clean by default and tell it to ignore _* Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf We don't want to stomp all over Salt's files, but we do want a pristine starting point to lay down our managed config. So we use clean: True on the file.recurse call, but we tell it to ignore files that start with an _ We have to rename the current config file (_defaults.conf) because it will be ignored by the rule that ignores Salt's _* config files. This also means we need to clean up old config files (_defaults.conf) and restart the service if we cleaned it up.
2015-03-27 23:58:05 +01:00
- exclude_pat: _*
feat(mapping): better control of the service's state Instead of the default service.running + enabled, you can control the actual state, via pillar. And you can even say 'state = ignore' and no state will be generated to control the service
2020-02-17 15:20:33 +01:00
{% if salt_settings.master_service_details.state != 'ignore' %}
service.{{ salt_settings.master_service_details.state }}:
- enable: {{ salt_settings.master_service_details.enabled }}
Don't overwrite salt variable Using a variable named salt is a bad idea when salt already has a variable named salt.
2015-03-17 05:39:32 +01:00
- name: {{ salt_settings.master_service }}
Start on salt formula
2013-06-13 01:53:26 +02:00
- watch:
changed master require to watch, and both to salt-master
2013-08-13 00:33:02 +02:00
- file: salt-master
Switch config file.recurse to clean by default and tell it to ignore _* Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf We don't want to stomp all over Salt's files, but we do want a pristine starting point to lay down our managed config. So we use clean: True on the file.recurse call, but we tell it to ignore files that start with an _ We have to rename the current config file (_defaults.conf) because it will be ignored by the rule that ignores Salt's _* config files. This also means we need to clean up old config files (_defaults.conf) and restart the service if we cleaned it up.
2015-03-27 23:58:05 +01:00
- file: remove-old-master-conf-file
feat(mapping): better control of the service's state Instead of the default service.running + enabled, you can control the actual state, via pillar. And you can even say 'state = ignore' and no state will be generated to control the service
2020-02-17 15:20:33 +01:00
{% endif %}
Add optional method to remove /etc/salt/master. Signed-off-by: Rene Jochum <rene@jochums.at>
2016-07-15 15:13:21 +02:00
{% if salt_settings.master_remove_config %}
remove-default-master-conf-file:
file.absent:
- name: {{ salt_settings.config_path }}/master
{% endif %}
Switch config file.recurse to clean by default and tell it to ignore _* Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf We don't want to stomp all over Salt's files, but we do want a pristine starting point to lay down our managed config. So we use clean: True on the file.recurse call, but we tell it to ignore files that start with an _ We have to rename the current config file (_defaults.conf) because it will be ignored by the rule that ignores Salt's _* config files. This also means we need to clean up old config files (_defaults.conf) and restart the service if we cleaned it up.
2015-03-27 23:58:05 +01:00
# clean up old _defaults.conf file if they have it around
remove-old-master-conf-file:
file.absent:
Replace absolute config pathname prefixes with the config_path variable
2016-03-29 19:28:47 +02:00
- name: {{ salt_settings.config_path }}/master.d/_defaults.conf