salt-formula/salt/master.sls

{% from "salt/map.jinja" import salt_settings with context %}

salt-master:
  pkg.installed:
    - name: {{ salt_settings.salt_master }}
  file.recurse:
    - name: {{ salt_settings.config_path }}/master.d
    - template: jinja
    - source: salt://salt/files/master.d
    - clean: {{ salt_settings.clean_config_d_dir }}
  service.running:
    - enable: True
    - name: {{ salt_settings.master_service }}
    - watch:
      - pkg: salt-master
      - file: salt-master
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			`{% from "salt/map.jinja" import salt_settings 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:`
			`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 }}`
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`
Start on salt formula 2013-06-13 01:53:26 +02:00			`- template: jinja`
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			`- source: salt://salt/files/master.d`
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 }}`
Start on salt formula 2013-06-13 01:53:26 +02:00			`service.running:`
			`- enable: True`
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			`- pkg: salt-master`
			`- file: salt-master`