Skip to content

Commit 4ce015c

Browse files
committed
refactor(tplroot): remove manual set after upstream merge
* saltstack/salt#51814
1 parent cd771ea commit 4ce015c

File tree

9 files changed

+0
-17
lines changed

9 files changed

+0
-17
lines changed

docs/TOFS_pattern.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ We can simplify the ``conf.sls`` with the new ``files_switch`` macro to use in t
306306
include:
307307
- ntp
308308
309-
{%- set tplroot = tpldir.split('/')[0] %}
310309
{%- from 'ntp/map.jinja' import ntp with context %}
311310
{%- from 'ntp/libtofs.jinja' import files_switch %}
312311

template/config/clean.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
64
{%- set sls_service_clean = tplroot ~ '.service.clean' %}
75
{%- from tplroot ~ "/map.jinja" import template with context %}
86

template/config/file.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
64
{%- set sls_package_install = tplroot ~ '.package.install' %}
75
{%- from tplroot ~ "/map.jinja" import template with context %}
86
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}

template/libtofs.jinja

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
- salt://xxx/files/default/etc/yyy/zzz.conf.jinja
4848
- template: jinja
4949
#}
50-
{#- Get the `tplroot` from `tpldir` #}
51-
{%- set tplroot = tpldir.split('/')[0] %}
5250
{%- set path_prefix = salt['config.get'](tplroot ~ ':tofs:path_prefix', tplroot) %}
5351
{%- set files_dir = salt['config.get'](tplroot ~ ':tofs:dirs:files', 'files') %}
5452
{%- set files_switch_list = salt['config.get'](

template/map.jinja

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=jinja
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
64
{#- Start imports as #}
75
{%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
86
{%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}

template/package/clean.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
64
{%- set sls_config_clean = tplroot ~ '.config.clean' %}
75
{%- from tplroot ~ "/map.jinja" import template with context %}
86

template/package/install.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
64
{%- from tplroot ~ "/map.jinja" import template with context %}
75
86
template-package-install-pkg-installed:

template/service/clean.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
64
{%- from tplroot ~ "/map.jinja" import template with context %}
75
86
template-service-clean-service-dead:

template/service/running.sls

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
64
{%- set sls_config_file = tplroot ~ '.config.file' %}
75
{%- from tplroot ~ "/map.jinja" import template with context %}
86

0 commit comments

Comments
 (0)