Get rid of the $pyvers variable
Since everyone has switched to Python3, it's time for the removal of the $pyvers variable. Change-Id: I7345ff04a5a4a7fe30c54871a35e391b21781653
This commit is contained in:
parent
0d888ec744
commit
369f391be0
|
@ -4,11 +4,10 @@
|
|||
#
|
||||
class designate::params {
|
||||
include openstacklib::defaults
|
||||
$pyvers = $::openstacklib::defaults::pyvers
|
||||
|
||||
$state_path = '/var/lib/designate'
|
||||
$log_dir = '/var/log/designate'
|
||||
$client_package_name = "python${pyvers}-designateclient"
|
||||
$client_package_name = 'python3-designateclient'
|
||||
$agent_service_name = 'designate-agent'
|
||||
$api_service_name = 'designate-api'
|
||||
$central_service_name = 'designate-central'
|
||||
|
|
|
@ -53,15 +53,7 @@ describe 'designate::client' do
|
|||
when 'Debian'
|
||||
{ :client_package_name => 'python3-designateclient' }
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystem] == 'Fedora'
|
||||
{ :client_package_name => 'python3-designateclient' }
|
||||
else
|
||||
if facts[:operatingsystemmajrelease] > '7'
|
||||
{ :client_package_name => 'python3-designateclient' }
|
||||
else
|
||||
{ :client_package_name => 'python-designateclient' }
|
||||
end
|
||||
end
|
||||
{ :client_package_name => 'python3-designateclient' }
|
||||
end
|
||||
end
|
||||
it_behaves_like 'designate-client'
|
||||
|
|
Loading…
Reference in New Issue