diff --git a/AUTHORS.md b/AUTHORS.md index 0540228..b10c8cf 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)|87 -@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|41 +@myii|[@myii](https://github.com/myii)|88 +@baby-gnu|[@baby-gnu](https://github.com/baby-gnu)|42 @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-29. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-01-30. diff --git a/CHANGELOG.md b/CHANGELOG.md index 67c6133..63021aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [3.8.3](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.8.2...v3.8.3) (2021-01-30) + + +### Code Refactoring + +* **inspec:** prefer shared system library to “inspec.os” ([9adfeb2](https://github.com/saltstack-formulas/libvirt-formula/commit/9adfeb2883411b58e8505e7fcb5b671d73e7c1ae)) + ## [3.8.2](https://github.com/saltstack-formulas/libvirt-formula/compare/v3.8.1...v3.8.2) (2021-01-29) diff --git a/FORMULA b/FORMULA index f82e701..caba7cc 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: libvirt os: Debian, CentOS, openSUSE, Suse os_family: Debian, RedHat, Suse -version: 3.8.2 +version: 3.8.3 release: 1 minimum_version: 2018.3 summary: libvirt formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 5b66428..38ea7dd 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 `_ - - 87 + - 88 * - :raw-html-m2r:`@baby-gnu` - `@baby-gnu `_ - - 41 + - 42 * - :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-29. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-01-30. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 7d8ef87..7603938 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog ========= +`3.8.3 `_ (2021-01-30) +--------------------------------------------------------------------------------------------------------- + +Code Refactoring +^^^^^^^^^^^^^^^^ + + +* **inspec:** prefer shared system library to “inspec.os” (\ `9adfeb2 `_\ ) + `3.8.2 `_ (2021-01-29) --------------------------------------------------------------------------------------------------------- diff --git a/test/integration/share/libraries/libvirt.rb b/test/integration/share/libraries/libvirt.rb index ad54f3f..273b4df 100644 --- a/test/integration/share/libraries/libvirt.rb +++ b/test/integration/share/libraries/libvirt.rb @@ -21,14 +21,14 @@ def initialize end def daemon_config_dir - case inspec.os[:family] + case inspec.system.platform[:family] when 'debian' '/etc/default/' when 'redhat', 'fedora', 'suse' '/etc/sysconfig' else raise Inspec::Exceptions::ResourceSkipped, - "OS family #{inspec.os[:family]} not supported" + "OS family #{inspec.system.platform[:family]} not supported" end end @@ -37,7 +37,7 @@ def daemon_config_file end def service_name - case inspec.os[:name] + case inspec.system.platform[:name] when 'ubuntu' service_name_ubuntu @@ -47,7 +47,7 @@ def service_name end def service_name_ubuntu - case inspec.os[:release] + case inspec.system.platform[:release] when /^16/ 'libvirt-bin' diff --git a/test/integration/share/libraries/libvirt_packages.rb b/test/integration/share/libraries/libvirt_packages.rb index 73f8893..d07bf42 100644 --- a/test/integration/share/libraries/libvirt_packages.rb +++ b/test/integration/share/libraries/libvirt_packages.rb @@ -31,7 +31,7 @@ def build_packages def build_os_family_packages # osfamily.yaml / osmap.yaml - case inspec.os[:family] + case inspec.system.platform[:family] when 'debian' build_debian_packages @@ -48,7 +48,7 @@ def build_os_family_packages def build_os_name_packages # osfamily.yaml / osmap.yaml - case inspec.os[:name] + case inspec.system.platform[:name] when 'centos' build_centos_packages @@ -108,7 +108,7 @@ def build_suse_packages end def build_centos_packages - case inspec.os[:release] + case inspec.system.platform[:release] when /^7/ if inspec.salt_minion.python3? { 'python' => [] } @@ -122,7 +122,7 @@ def build_centos_packages end def build_ubuntu_packages - case inspec.os[:release] + case inspec.system.platform[:release] when /^16/ { 'libvirt' => ['libvirt-bin'] } else diff --git a/test/integration/share/libraries/libvirt_socket_admin.rb b/test/integration/share/libraries/libvirt_socket_admin.rb index 7988802..2501103 100644 --- a/test/integration/share/libraries/libvirt_socket_admin.rb +++ b/test/integration/share/libraries/libvirt_socket_admin.rb @@ -28,11 +28,13 @@ def skipped_platform? end def skipped_debian? - inspec.os[:name] == 'debian' && inspec.os[:release].match(/^8/) + inspec.system.platform[:name] == + 'debian' && inspec.system.platform[:release].match(/^8/) end def skipped_ubuntu? - inspec.os[:name] == 'ubuntu' && inspec.os[:release].match(/^16/) + inspec.system.platform[:name] == + 'ubuntu' && inspec.system.platform[:release].match(/^16/) end def config_owner