Inherit pyvers from openstacklib::defaults
Change-Id: I7793670ff6cbe20e69b2b3bcc1f3ece910cbf989
This commit is contained in:
parent
add60ec439
commit
da53614191
|
@ -5,13 +5,7 @@
|
||||||
class manila::params {
|
class manila::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}-manilaclient"
|
$client_package = "python${pyvers}-manilaclient"
|
||||||
$db_sync_command = 'manila-manage db sync'
|
$db_sync_command = 'manila-manage db sync'
|
||||||
|
|
|
@ -27,11 +27,7 @@ describe 'manila::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-manilaclient' }
|
{ :client_package => 'python3-manilaclient' }
|
||||||
else
|
|
||||||
{ :client_package => 'python-manilaclient' }
|
|
||||||
end
|
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :client_package => 'python-manilaclient' }
|
{ :client_package => 'python-manilaclient' }
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue