Browse Source

fix(tpl_path): replace slspath to tplroot

tags/v1.1.3
sticky-note 4 years ago
parent
commit
bbcc4cda7a
5 changed files with 8 additions and 5 deletions
  1. +2
    -1
      salt/cloud.sls
  2. +1
    -1
      salt/master.sls
  3. +1
    -1
      salt/minion.sls
  4. +2
    -1
      salt/ssh.sls
  5. +2
    -1
      salt/standalone.sls

+ 2
- 1
salt/cloud.sls View File

{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %} {% from "salt/map.jinja" import salt_settings with context %}


{%- if salt_settings.use_pip %} {%- if salt_settings.use_pip %}
cloud-cert-{{ cert }}-pem: cloud-cert-{{ cert }}-pem:
file.managed: file.managed:
- name: {{ salt_settings.config_path }}/pki/cloud/{{ cert }}.pem - name: {{ salt_settings.config_path }}/pki/cloud/{{ cert }}.pem
- source: salt://{{ slspath }}/files/key
- source: salt://{{ tplroot }}/files/key
- template: jinja - template: jinja
- user: root - user: root
- group: - group:

+ 1
- 1
salt/master.sls View File

}} }}
{%- else %} {%- else %}
- template: jinja - template: jinja
- source: salt://{{ slspath }}/files/master.d
- source: salt://{{ tplroot }}/files/master.d
{%- endif %} {%- endif %}
- clean: {{ salt_settings.clean_config_d_dir }} - clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _* - exclude_pat: _*

+ 1
- 1
salt/minion.sls View File

}} }}
{%- else %} {%- else %}
- template: jinja - template: jinja
- source: salt://{{ slspath }}/files/minion.d
- source: salt://{{ tplroot }}/files/minion.d
- context: - context:
standalone: False standalone: False
{%- endif %} {%- endif %}

+ 2
- 1
salt/ssh.sls View File

{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %} {% from "salt/map.jinja" import salt_settings with context %}


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

+ 2
- 1
salt/standalone.sls View File

{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %} {% from "salt/map.jinja" import salt_settings with context %}


salt-minion: salt-minion:
file.recurse: file.recurse:
- name: {{ salt_settings.config_path }}/minion.d - name: {{ salt_settings.config_path }}/minion.d
- template: jinja - template: jinja
- source: salt://{{ slspath }}/files/minion.d
- source: salt://{{ tplroot }}/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