openstack/puppet-trove
Code Issues Proposed changes

Merge "Inherit pyvers from openstacklib::defaults"

Browse Source
This commit is contained in:
Zuul 2019-01-19 04:15:58 +00:00 committed by Gerrit Code Review
commit bbc9f81bdc
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@ -4,13 +4,7 @@
# #
class trove::params { class trove::params {
include ::openstacklib::defaults 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}-troveclient" $client_package_name = "python${pyvers}-troveclient"
$group = 'trove' $group = 'trove'

4
spec/classes/trove_client_spec.rb
View File

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