diff --git a/AUTHORS.md b/AUTHORS.md index b10c8cf..611af02 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)|88 -@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|42 +@myii|[@myii](https://github.com/myii)|89 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|44 @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 2021-01-30. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-01-31. diff --git a/CHANGELOG.md b/CHANGELOG.md index 63021aa..3e4b9d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +# [3.9.0](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.8.3...v3.9.0) (2021-01-31) + + +### Features + +* **python:** define python3 package for OpenSuse Tumbleweed ([b6cc44c](https://github.com/saltstack-formulas/libvirt-formula/commit/b6cc44cf6622cad392d92fcf21609c61d15b1081)) + + +### Tests + +* **inspec:** tumbleweed OpenSUSE use “python38-libvirt-python” ([94b245f](https://github.com/saltstack-formulas/libvirt-formula/commit/94b245f4ca925f67c1aa534ebc2917a054213833)) + ## [3.8.3](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.8.2...v3.8.3) (2021-01-30) diff --git a/FORMULA b/FORMULA index caba7cc..305c433 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: libvirt os: Debian, CentOS, openSUSE, Suse os_family: Debian, RedHat, Suse -version: 3.8.3 +version: 3.9.0 release: 1 minimum_version: 2018.3 summary: libvirt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 38ea7dd..1991956 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 `_ - - 88 + - 89 * - :raw-html-m2r:`@baby-gnu` - `@baby-gnu `_ - - 42 + - 44 * - :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 2021-01-30. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-01-31. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 7603938..7cccf28 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,21 @@ Changelog ========= +`3.9.0 `_ (2021-01-31) +--------------------------------------------------------------------------------------------------------- + +Features +^^^^^^^^ + + +* **python:** define python3 package for OpenSuse Tumbleweed (\ `b6cc44c `_\ ) + +Tests +^^^^^ + + +* **inspec:** tumbleweed OpenSUSE use “python38-libvirt-python” (\ `94b245f `_\ ) + `3.8.3 `_ (2021-01-30) --------------------------------------------------------------------------------------------------------- diff --git a/libvirt/parameters/defaults.yaml b/libvirt/parameters/defaults.yaml index 98730f1..3edf8c7 100644 --- a/libvirt/parameters/defaults.yaml +++ b/libvirt/parameters/defaults.yaml @@ -2,6 +2,16 @@ # vim: ft=yaml --- values: + map_jinja: + sources: + - osarch + - os_family + - os + - oscodename + - osfinger + - config_get_lookup + - config_get + - id libvirt_pkg: libvirt qemu_pkg: qemu python2_pkg: libvirt-python diff --git a/libvirt/parameters/oscodename/openSUSE Tumbleweed.yaml b/libvirt/parameters/oscodename/openSUSE Tumbleweed.yaml new file mode 100644 index 0000000..4e7afa4 --- /dev/null +++ b/libvirt/parameters/oscodename/openSUSE Tumbleweed.yaml @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# vim: ft=yaml +# +# Setup variables specific to +# salt['config.get']('oscodename') == openSUSE Tumbleweed. +# You just need to add the key:values for this `oscodename` that differ +# from `defaults.yaml` + `.yaml` + `.yaml` + `.yaml`. +# +# If you do not need to provide defaults via the `oscodename` config, +# you can remove this file or provide at least an empty dict, e.g. +# values: {} +--- +values: + python2_pkg: ~ + python3_pkg: python38-libvirt-python +... diff --git a/test/integration/share/libraries/libvirt_packages.rb b/test/integration/share/libraries/libvirt_packages.rb index d07bf42..d769f41 100644 --- a/test/integration/share/libraries/libvirt_packages.rb +++ b/test/integration/share/libraries/libvirt_packages.rb @@ -99,14 +99,23 @@ def build_suse_packages { 'libvirt' => ['libvirt-daemon-qemu'], 'extra' => ['libguestfs0'], - 'python' => if inspec.salt_minion.python3? - ['python3-libvirt-python'] - else - ['python2-libvirt-python'] - end + 'python' => build_suse_python_package } end + def build_suse_python_package + case inspec.system.platform[:release] + when 'tumbleweed' + ['python38-libvirt-python'] + else + if inspec.salt_minion.python3? + ['python3-libvirt-python'] + else + ['python2-libvirt-python'] + end + end + end + def build_centos_packages case inspec.system.platform[:release] when /^7/