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

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

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

+ 1
- 1
salt/master.sls View File

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

+ 1
- 1
salt/minion.sls View File

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

+ 2
- 1
salt/ssh.sls View File

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

{% if salt_settings.install_packages %}
@@ -12,7 +13,7 @@ ensure-salt-ssh-is-installed:
ensure-roster-config:
file.managed:
- name: {{ salt_settings.config_path }}/roster
- source: salt://{{ slspath }}/files/roster.jinja
- source: salt://{{ tplroot }}/files/roster.jinja
- template: jinja
{% if salt_settings.install_packages %}
- require:

+ 2
- 1
salt/standalone.sls View File

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

salt-minion:
@@ -11,7 +12,7 @@ salt-minion:
file.recurse:
- name: {{ salt_settings.config_path }}/minion.d
- template: jinja
- source: salt://{{ slspath }}/files/minion.d
- source: salt://{{ tplroot }}/files/minion.d
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
- context:

Loading…
Cancel
Save