diff --git a/AUTHORS.md b/AUTHORS.md index b7a3c85..32975fc 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|51 -@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|29 +@myii|[@myii](https://github.com/myii)|52 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|30 @aboe76|[@aboe76](https://github.com/aboe76)|18 @gravyboat|[@gravyboat](https://github.com/gravyboat)|6 @whiteinge|[@whiteinge](https://github.com/whiteinge)|4 @@ -28,4 +28,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-03-26. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-03-27. diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b8bbfa..e315761 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.7.3](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.7.2...v3.7.3) (2020-03-27) + + +### Code Refactoring + +* **libsaltcli:** use the `opts` dict throughout ([94e1bde](https://github.com/saltstack-formulas/libvirt-formula/commit/94e1bde4038373efd1c3bb5db1bb5717b1a8d067)) + ## [3.7.2](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.7.1...v3.7.2) (2020-03-26) diff --git a/FORMULA b/FORMULA index b9bc05c..5eb62eb 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: libvirt os: Debian, CentOS, openSUSE, Suse os_family: Debian, RedHat, Suse -version: 3.7.2 +version: 3.7.3 release: 1 minimum_version: 2018.3 summary: libvirt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index b964441..8568687 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 51 + - 52 * - :raw-html-m2r:`@baby-gnu` - `@baby-gnu `_ - - 29 + - 30 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 18 @@ -80,4 +80,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-03-26. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-03-27. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index d6c56cb..1059f71 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`3.7.3 `_ (2020-03-27) +--------------------------------------------------------------------------------------------------------- + +Code Refactoring +^^^^^^^^^^^^^^^^ + + +* **libsaltcli:** use the ``opts`` dict throughout (\ `94e1bde `_\ ) + `3.7.2 `_ (2020-03-26) --------------------------------------------------------------------------------------------------------- diff --git a/libvirt/libsaltcli.jinja b/libvirt/libsaltcli.jinja index 60bad8a..5374ae2 100644 --- a/libvirt/libsaltcli.jinja +++ b/libvirt/libsaltcli.jinja @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- # vim: ft=jinja -{#- Determine the type of command being run #} -{%- if salt['config.get']('__cli') == 'salt-minion' %} +{#- Get the relevant values from the `opts` dict #} +{%- set opts_cli = opts.get('__cli', '') %} +{%- set opts_masteropts_cli = opts | traverse('__master_opts__:__cli', '') %} + +{#- Determine the type of salt command being run #} +{%- if opts_cli == 'salt-minion' %} {%- set cli = 'minion' %} -{%- elif salt['config.get']('__cli') == 'salt-call' %} -{%- if opts.get('__master_opts__', {}).get('__cli') == 'salt-ssh' %} -{%- set cli = 'ssh' %} -{%- else %} -{%- set cli = 'local' %} -{%- endif %} +{%- elif opts_cli == 'salt-call' %} +{%- set cli = 'ssh' if opts_masteropts_cli == 'salt-ssh' else 'local' %} {%- else %} {%- set cli = 'unknown' %} {%- endif %}