saltstack-formulas/openssh-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style(mapstack): variables in macro can't be exported

Browse Source 
No need to prefix some of them with underscore `_`.
This commit is contained in:
Daniel Dehennin 2021-01-11 19:01:08 +01:00
parent ff6b56c4a4
commit 7de2d6fd75
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openssh/libmapstack.jinja
View File

@ -114,7 +114,7 @@
{#- 1. the `value` #} {#- 1. the `value` #}
{#- 2. the `defaults` #} {#- 2. the `defaults` #}
{#- 3. the built-in #} {#- 3. the built-in #}
{%- set _strategy = matcher.value {%- set strategy = matcher.value
| traverse( | traverse(
"strategy", "strategy",
defaults defaults
@ -123,7 +123,7 @@
"smart" "smart"
) )
) %} ) %}
{%- set _merge_lists = matcher.value {%- set merge_lists = matcher.value
| traverse( | traverse(
"merge_lists", "merge_lists",
defaults defaults
@ -156,9 +156,9 @@
~ "' retrieved with '" ~ "' retrieved with '"
~ matcher.query_method ~ matcher.query_method
~ "', merge: strategy='" ~ "', merge: strategy='"
~ _strategy ~ strategy
~ "', lists='" ~ "', lists='"
~ _merge_lists ~ merge_lists
~ "':\n" ~ "':\n"
~ value ~ value
| yaml(False) | yaml(False)
@ -169,8 +169,8 @@
"values": salt["slsutil.merge"]( "values": salt["slsutil.merge"](
stack["values"], stack["values"],
value, value,
strategy=_strategy, strategy=strategy,
merge_lists=_merge_lists, merge_lists=merge_lists,
) )
} }
) %} ) %}
@ -238,7 +238,7 @@
{#- 1. the `value` #} {#- 1. the `value` #}
{#- 2. the `defaults` #} {#- 2. the `defaults` #}
{#- 3. the built-in #} {#- 3. the built-in #}
{%- set _strategy = yaml_values {%- set strategy = yaml_values
| traverse( | traverse(
"strategy", "strategy",
defaults defaults
@ -247,7 +247,7 @@
"smart" "smart"
) )
) %} ) %}
{%- set _merge_lists = yaml_values {%- set merge_lists = yaml_values
| traverse( | traverse(
"merge_lists", "merge_lists",
defaults defaults
@ -263,8 +263,8 @@
stack["values"], stack["values"],
yaml_values yaml_values
| traverse("values", {}), | traverse("values", {}),
strategy=_strategy, strategy=strategy,
merge_lists=_merge_lists, merge_lists=merge_lists,
) )
} }
) %} ) %}
@ -273,9 +273,9 @@
~ "merged configuration values from " ~ "merged configuration values from "
~ yaml_name ~ yaml_name
~ ", merge: strategy='" ~ ", merge: strategy='"
~ _strategy ~ strategy
~ "', merge_lists='" ~ "', merge_lists='"
~ _merge_lists ~ merge_lists
~ "':\n" ~ "':\n"
~ {"values": stack["values"]} ~ {"values": stack["values"]}
| yaml(False) | yaml(False)