openstack
/
puppet-manila
Code Issues Proposed changes

Merge "Inherit pyvers from openstacklib::defaults"

This commit is contained in:
Zuul 2019-01-19 00:28:43 +00:00 committed by Gerrit Code Review
parent 80c08c1bb2 da53614191
commit 7fe4316d6b
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

@ -5,13 +5,7 @@
class manila::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-manilaclient"
$db_sync_command = 'manila-manage db sync'

6
spec/classes/manila_client_spec.rb
View File

@ -27,11 +27,7 @@ describe 'manila::client' do
let :platform_params do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package => 'python3-manilaclient' }
else
{ :client_package => 'python-manilaclient' }
end
{ :client_package => 'python3-manilaclient' }
when 'RedHat'
{ :client_package => 'python-manilaclient' }
end