Skip to content

Commit 9825f57

Browse files
committed
refactor(include+require): use variable for duplicate values
1 parent a349b30 commit 9825f57

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

template/config/clean.sls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33

44
{#- Get the `topdir` from `tpldir` #}
55
{%- set topdir = tpldir.split('/')[0] %}
6+
{%- set sls_service_clean = topdir ~ '.service.clean' %}
67
{%- from topdir ~ "/map.jinja" import template with context %}
78
{%- from topdir ~ "/macros.jinja" import files_switch with context %}
89
910
include:
10-
- {{ topdir }}.service.clean
11+
- {{ sls_service_clean }}
1112
1213
template-config-absent:
1314
file.absent:
1415
- name: {{ template.config }}
1516
- require:
16-
- sls: {{ topdir }}.service.clean
17+
- sls: {{ sls_service_clean }}

template/config/file.sls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33

44
{#- Get the `topdir` from `tpldir` #}
55
{%- set topdir = tpldir.split('/')[0] %}
6+
{%- set sls_pkg_install = topdir ~ '.pkg.install' %}
67
{%- from topdir ~ "/map.jinja" import template with context %}
78
{%- from topdir ~ "/macros.jinja" import files_switch with context %}
89
910
include:
10-
- {{ topdir }}.pkg.install
11+
- {{ sls_pkg_install }}
1112
1213
template-config:
1314
file.managed:
@@ -23,4 +24,4 @@ template-config:
2324
- group: root
2425
- template: jinja
2526
- require:
26-
- sls: {{ topdir }}.pkg.install
27+
- sls: {{ sls_pkg_install }}

template/pkg/clean.sls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
{#- Get the `topdir` from `tpldir` #}
55
{%- set topdir = tpldir.split('/')[0] %}
6+
{%- set sls_config_clean = topdir ~ '.config.clean' %}
67
{%- from topdir ~ "/map.jinja" import template with context %}
78
89
include:
9-
- {{ topdir }}.config.clean
10+
- {{ sls_config_clean }}
1011
1112
template-pkg-removed:
1213
pkg.removed:
1314
- name: {{ template.pkg }}
1415
- require:
15-
- sls: {{ topdir }}.config.clean
16+
- sls: {{ sls_config_clean }}

template/service/running.sls

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33

44
{#- Get the `topdir` from `tpldir` #}
55
{%- set topdir = tpldir.split('/')[0] %}
6+
{%- set sls_config_file = topdir ~ '.config.file' %}
67
{%- from topdir ~ "/map.jinja" import template with context %}
78
89
include:
9-
- {{ topdir }}.config.file
10+
- {{ sls_config_file }}
1011
1112
template-service:
1213
service.running:
1314
- name: {{ template.service.name }}
1415
- enable: True
1516
- require:
16-
- sls: {{ topdir }}.config.file
17+
- sls: {{ sls_config_file }}

0 commit comments

Comments
 (0)