openstack
/
puppet-heat
Code Issues Proposed changes

Merge "Inherit pyvers from openstacklib::defaults"

This commit is contained in:
Zuul 2019-01-18 02:33:17 +00:00 committed by Gerrit Code Review
parent 9fa99c2bdf 01ac308d05
commit 0e918ef498
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/params.pp
View File

@ -4,13 +4,8 @@
#
class heat::params {
include ::openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$client_package_name = "python${pyvers}-heatclient"
$group = 'heat'

6
spec/classes/heat_client_spec.rb
View File

@ -38,11 +38,7 @@ describe 'heat::client' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-heatclient' }
else
{ :client_package_name => 'python-heatclient' }
end
{ :client_package_name => 'python3-heatclient' }
when 'RedHat'
{ :client_package_name => 'python-heatclient' }
end