feat(libsaltcli): update salt-ssh detection for enable_ssh_minions

* Explained by @max-arnold: - saltstack-formulas/template-formula@69b632f#r38597329
myii · Apr 19, 2020 · 16ec994 · 16ec994
1 parent 0b6c6d2
commit 16ec994
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length rule:quoted-strings
-            title: "test: verify map output using '`'yaml_dump'`'"
-            body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/159'
+            title: "fix(libsaltcli): update '`'salt-ssh'`' detection for '`'enable_ssh_minions'`'"
+            body: '* Automated using https://github.com/myii/ssf-formula/pull/161'
             # yamllint enable rule:line-length rule:quoted-strings
           github:
             owner: 'saltstack-formulas'

diff --git a/ssf/files/default/formula/libsaltcli.jinja b/ssf/files/default/formula/libsaltcli.jinja
@@ -9,7 +9,7 @@
 {%- if opts_cli == 'salt-minion' %}
 {%-   set cli = 'minion' %}
 {%- elif opts_cli == 'salt-call' %}
-{%-   set cli = 'ssh' if opts_masteropts_cli == 'salt-ssh' else 'local' %}
+{%-   set cli = 'ssh' if opts_masteropts_cli in ('salt-ssh', 'salt-master') else 'local' %}
 {%- else %}
 {%-   set cli = 'unknown' %}
 {%- endif %}