Get rid of the $pyvers variable
Since everyone has switched to Python3, it's time for the removal of the $pyvers variable. Change-Id: I6095e9aa5f9c6dcd07e246d78f86ff2ef5660fa4
This commit is contained in:
parent
531e6a649a
commit
d48492d84a
|
@ -2,11 +2,10 @@
|
||||||
#
|
#
|
||||||
class freezer::params {
|
class freezer::params {
|
||||||
include openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::pyvers
|
|
||||||
|
|
||||||
$api_deploy_method = 'apache'
|
$api_deploy_method = 'apache'
|
||||||
$api_bind_port = '9090'
|
$api_bind_port = '9090'
|
||||||
$client_package = "python${pyvers}-freezerclient"
|
$client_package = 'python3-freezerclient'
|
||||||
$freezer_db_backend = 'elasticsearch'
|
$freezer_db_backend = 'elasticsearch'
|
||||||
$db_sync_command = 'freezer-manage db sync'
|
$db_sync_command = 'freezer-manage db sync'
|
||||||
$group = 'freezer'
|
$group = 'freezer'
|
||||||
|
|
|
@ -27,15 +27,7 @@ describe 'freezer::client' do
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
{ :client_package_name => 'python3-freezerclient' }
|
{ :client_package_name => 'python3-freezerclient' }
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
if facts[:operatingsystem] == 'Fedora'
|
{ :client_package_name => 'python3-freezerclient' }
|
||||||
{ :client_package_name => 'python3-freezerclient' }
|
|
||||||
else
|
|
||||||
if facts[:operatingsystemmajrelease] > '7'
|
|
||||||
{ :client_package_name => 'python3-freezerclient' }
|
|
||||||
else
|
|
||||||
{ :client_package_name => 'python-freezerclient' }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue