diff --git a/manifests/params.pp b/manifests/params.pp index e3508599..c26a7d70 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/spec/classes/designate_client_spec.rb b/spec/classes/designate_client_spec.rb index 8210debe..ba4307ca 100644 --- a/spec/classes/designate_client_spec.rb +++ b/spec/classes/designate_client_spec.rb @@ -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'