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

fix(libmatchers): python client API can use config.get options

Browse Source 
Only `salt-ssh` can't use them actually.

* openssh/libsaltcli.jinja: detect non empty `opts['__cli']` as `api`.

* openssh/libmatchers.jinja: only `ssh` and `unknown` can't use
  `config.get` options `merge` and `delimiter`.
This commit is contained in:
Daniel Dehennin 2022-02-03 14:08:37 +01:00
parent eede9fa54c
commit 560a5ccbbc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssh/libmatchers.jinja
View File

@ -162,7 +162,7 @@
{%- endif %} {%- endif %}
{#- Add `merge:` option to `salt["config.get"]` if configured #} {#- Add `merge:` option to `salt["config.get"]` if configured #}
{%- if cli in ["minion", "local"] and parsed.query_method == "config.get" and config_get_strategy %} {%- if cli not in ["ssh", "unknown"] and parsed.query_method == "config.get" and config_get_strategy %}
{%- set query_opts = { {%- set query_opts = {
"merge": config_get_strategy, "merge": config_get_strategy,
"delimiter": parsed.query_delimiter, "delimiter": parsed.query_delimiter,
@ -175,8 +175,8 @@
~ "'" ~ "'"
) %} ) %}
{%- else %} {%- else %}
{%- if cli not in ["minion", "local"] %} {%- if cli in ["ssh", "unknown"] %}
{%- do salt["log.error"]( {%- do salt["log.warning"](
log_prefix log_prefix
~ "the 'delimiter' and 'merge' options of 'config.get' are skipped when the salt command type is '" ~ "the 'delimiter' and 'merge' options of 'config.get' are skipped when the salt command type is '"
~ cli ~ cli

2
openssh/libsaltcli.jinja
View File

@ -10,6 +10,8 @@
{%- set cli = 'minion' %} {%- set cli = 'minion' %}
{%- elif opts_cli == 'salt-call' %} {%- elif opts_cli == 'salt-call' %}
{%- set cli = 'ssh' if opts_masteropts_cli in ('salt-ssh', 'salt-master') else 'local' %} {%- set cli = 'ssh' if opts_masteropts_cli in ('salt-ssh', 'salt-master') else 'local' %}
{%- elif opts_cli %}
{%- set cli = 'api' %}
{%- else %} {%- else %}
{%- set cli = 'unknown' %} {%- set cli = 'unknown' %}
{%- endif %} {%- endif %}