Procházet zdrojové kódy

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

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`.
tags/v3.0.2
Daniel Dehennin před 2 roky
rodič
revize
560a5ccbbc
2 změnil soubory, kde provedl 5 přidání a 3 odebrání
  1. +3
    -3
      openssh/libmatchers.jinja
  2. +2
    -0
      openssh/libsaltcli.jinja

+ 3
- 3
openssh/libmatchers.jinja Zobrazit soubor

@@ -162,7 +162,7 @@
{%- endif %}

{#- 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 = {
"merge": config_get_strategy,
"delimiter": parsed.query_delimiter,
@@ -175,8 +175,8 @@
~ "'"
) %}
{%- else %}
{%- if cli not in ["minion", "local"] %}
{%- do salt["log.error"](
{%- if cli in ["ssh", "unknown"] %}
{%- do salt["log.warning"](
log_prefix
~ "the 'delimiter' and 'merge' options of 'config.get' are skipped when the salt command type is '"
~ cli

+ 2
- 0
openssh/libsaltcli.jinja Zobrazit soubor

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

Načítá se…
Zrušit
Uložit