Browse Source

Remove hardcoded paths with {{ slspath }} variable

master
Niels Abspoel 9 years ago
parent
commit
6ec31374cb
6 changed files with 7 additions and 7 deletions
  1. +1
    -1
      salt/cloud.sls
  2. +1
    -1
      salt/master.sls
  3. +1
    -1
      salt/minion.sls
  4. +2
    -2
      salt/pkgrepo/debian/init.sls
  5. +1
    -1
      salt/ssh.sls
  6. +1
    -1
      salt/standalone.sls

+ 1
- 1
salt/cloud.sls View File

cloud-cert-{{ cert }}-pem: cloud-cert-{{ cert }}-pem:
file.managed: file.managed:
- name: /etc/salt/pki/cloud/{{ cert }}.pem - name: /etc/salt/pki/cloud/{{ cert }}.pem
- source: salt://salt/files/key
- source: salt://{{ slspath }}/files/key
- template: jinja - template: jinja
- user: root - user: root
- group: root - group: root

+ 1
- 1
salt/master.sls View File

file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/master.d - name: {{ salt_settings.config_path }}/master.d
- template: jinja - template: jinja
- source: salt://salt/files/master.d
- source: salt://{{ slspath }}/files/master.d
- clean: {{ salt_settings.clean_config_d_dir }} - clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _* - exclude_pat: _*
service.running: service.running:

+ 1
- 1
salt/minion.sls View File

file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d
- template: jinja - template: jinja
- source: salt://salt/files/minion.d
- source: salt://{{ slspath }}/files/minion.d
- clean: {{ salt_settings.clean_config_d_dir }} - clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _* - exclude_pat: _*
- context: - context:

+ 2
- 2
salt/pkgrepo/debian/init.sls View File

saltstack-apt-key: saltstack-apt-key:
file.managed: file.managed:
- name: /etc/apt/trusted.gpg.d/saltstack.gpg - name: /etc/apt/trusted.gpg.d/saltstack.gpg
- source: salt://salt/pkgrepo/debian/saltstack.gpg
- source: salt://{{ slspath }}/saltstack.gpg
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: 644
saltstack-pkgrepo: saltstack-pkgrepo:
file.managed: file.managed:
- name: /etc/apt/sources.list.d/saltstack.list - name: /etc/apt/sources.list.d/saltstack.list
- source: salt://salt/pkgrepo/debian/sources.list
- source: salt://{{ slspath }}/sources.list
- user: root - user: root
- group: root - group: root
- mode: 644 - mode: 644

+ 1
- 1
salt/ssh.sls View File

ensure-roster-config: ensure-roster-config:
file.managed: file.managed:
- name: {{ salt_settings.config_path }}/roster - name: {{ salt_settings.config_path }}/roster
- source: salt://salt/files/roster.jinja
- source: salt://{{ slspath }}/files/roster.jinja
- template: jinja - template: jinja
{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
- require: - require:

+ 1
- 1
salt/standalone.sls View File

file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d
- template: jinja - template: jinja
- source: salt://salt/files/minion.d
- source: salt://{{ slspath }}/files/minion.d
- clean: {{ salt_settings.clean_config_d_dir }} - clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _* - exclude_pat: _*
- context: - context:

Loading…
Cancel
Save