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

fix(tpl_path): replace slspath to tplroot

This commit is contained in:
sticky-note 2020-02-12 15:49:22 +11:00
parent d2d51864a5
commit bbcc4cda7a
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/cloud.sls
View File

@ -1,3 +1,4 @@
{%- 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 %}
@ -34,7 +35,7 @@ salt-cloud:
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:

2
salt/master.sls
View File

@ -24,7 +24,7 @@ salt-master:
}} }}
{%- 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: _*

2
salt/minion.sls
View File

@ -65,7 +65,7 @@ salt-minion:
}} }}
{%- 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 %}

3
salt/ssh.sls
View File

@ -1,3 +1,4 @@
{%- 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 %}
@ -12,7 +13,7 @@ ensure-salt-ssh-is-installed:
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:

3
salt/standalone.sls
View File

@ -1,3 +1,4 @@
{%- 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:
@ -11,7 +12,7 @@ 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: