refactor(tplroot): remove manual set after upstream merge

* saltstack/salt#51814
myii · Jun 25, 2019 · 4ce015c · 4ce015c
1 parent cd771ea
commit 4ce015c
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 17 deletions.
diff --git a/docs/TOFS_pattern.rst b/docs/TOFS_pattern.rst
@@ -306,7 +306,6 @@ We can simplify the ``conf.sls`` with the new ``files_switch`` macro to use in t
    include:
      - ntp
 
-   {%- set tplroot = tpldir.split('/')[0] %}
    {%- from 'ntp/map.jinja' import ntp with context %}
    {%- from 'ntp/libtofs.jinja' import files_switch %}
 

diff --git a/template/config/clean.sls b/template/config/clean.sls
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
 {%- from tplroot ~ "/map.jinja" import template with context %}
 

diff --git a/template/config/file.sls b/template/config/file.sls
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_package_install = tplroot ~ '.package.install' %}
 {%- from tplroot ~ "/map.jinja" import template with context %}
 {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}

diff --git a/template/libtofs.jinja b/template/libtofs.jinja
@@ -47,8 +47,6 @@
             - salt://xxx/files/default/etc/yyy/zzz.conf.jinja
           - template: jinja
   #}
-  {#- Get the `tplroot` from `tpldir` #}
-  {%- set tplroot = tpldir.split('/')[0] %}
   {%- set path_prefix = salt['config.get'](tplroot ~ ':tofs:path_prefix', tplroot) %}
   {%- set files_dir = salt['config.get'](tplroot ~ ':tofs:dirs:files', 'files') %}
   {%- set files_switch_list = salt['config.get'](

diff --git a/template/map.jinja b/template/map.jinja
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=jinja
 
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
 {#- Start imports as #}
 {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}

diff --git a/template/package/clean.sls b/template/package/clean.sls
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_clean = tplroot ~ '.config.clean' %}
 {%- from tplroot ~ "/map.jinja" import template with context %}
 

diff --git a/template/package/install.sls b/template/package/install.sls
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import template with context %}
 
 template-package-install-pkg-installed:

diff --git a/template/service/clean.sls b/template/service/clean.sls
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import template with context %}
 
 template-service-clean-service-dead:

diff --git a/template/service/running.sls b/template/service/running.sls
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
 {%- from tplroot ~ "/map.jinja" import template with context %}