Skip to content

Commit 27c527a

Browse files
Merge pull request #190 from baby-gnu/fix/no-path_join-for-salt-url
fix(map): `path_join` can be used only for local file access
2 parents b32ec98 + 3845d5f commit 27c527a

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

openssh/map.jinja

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
{%- from tplroot ~ "/libsaltcli.jinja" import cli with context %}
77

88
{#- Where to lookup parameters source files #}
9-
{%- set map_sources_dir = tplroot | path_join("parameters") %}
9+
{%- set map_sources_dir = tplroot ~ "/parameters" %}
1010

1111
{#- Load defaults first to allow per formula default map.jinja configuration #}
12-
{%- set _defaults_filename = map_sources_dir | path_join("defaults.yaml") %}
12+
{%- set _defaults_filename = map_sources_dir ~ "/defaults.yaml" %}
1313
{%- do salt["log.debug"](
1414
"map.jinja: initialise parameters from "
1515
~ _defaults_filename
@@ -172,10 +172,13 @@
172172
{%- endif %}
173173

174174
{%- for map_value in map_values %}
175-
{%- set yamlfile = map_sources_dir | path_join(
175+
{%- set yamlfile = [
176+
map_sources_dir,
176177
map_source,
177178
map_value ~ ".yaml",
178-
) %}
179+
]
180+
| join("/")
181+
%}
179182
{%- do salt["log.debug"]("map.jinja: load parameters from file " ~ yamlfile) %}
180183
{%- load_yaml as loaded_values %}
181184
{%- include yamlfile ignore missing %}

0 commit comments

Comments
 (0)