openstack/puppet-mistral
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Change-Id: I64fd0792e00fcb21c81cce879475c8986a6c2f7e
This commit is contained in:
Tobias Urdin
2019-01-17 21:42:38 +01:00
parent 76de1bcc95
commit dddb501f86
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@@ -4,13 +4,7 @@
# #
class mistral::params { class mistral::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 = "python${pyvers}-mistralclient" $client_package = "python${pyvers}-mistralclient"
$db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head' $db_sync_command = 'mistral-db-manage --config-file=/etc/mistral/mistral.conf upgrade head'

6
spec/classes/mistral_client_spec.rb
View File

@@ -27,11 +27,7 @@ describe 'mistral::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 => 'python3-mistralclient' }
{ :client_package => 'python3-mistralclient' }
else
{ :client_package => 'python-mistralclient' }
end
when 'RedHat' when 'RedHat'
{ :client_package => 'python-mistralclient' } { :client_package => 'python-mistralclient' }
end end