diff --git a/manifests/params.pp b/manifests/params.pp index 9c3bed182..4d85b1fcf 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,8 +4,8 @@ # should be considered to be constant class nova::params { include openstacklib::defaults - $pyvers = $::openstacklib::defaults::pyvers - $client_package = "python${pyvers}-novaclient" + + $client_package = 'python3-novaclient' $group = 'nova' case $::osfamily { @@ -13,10 +13,10 @@ class nova::params { # package names $api_package_name = 'openstack-nova-api' $common_package_name = 'openstack-nova-common' - $python_package_name = "python${pyvers}-nova" + $python_package_name = 'python3-nova' $compute_package_name = 'openstack-nova-compute' $conductor_package_name = 'openstack-nova-conductor' - $novajoin_package_name = "python${pyvers}-novajoin" + $novajoin_package_name = 'python3-novajoin' $doc_package_name = 'openstack-nova-doc' $libvirt_package_name = 'libvirt' $libvirt_guests_package_name = 'libvirt-client' @@ -66,7 +66,7 @@ class nova::params { # package names $api_package_name = 'nova-api' $common_package_name = 'nova-common' - $python_package_name = "python${pyvers}-nova" + $python_package_name = 'python3-nova' $compute_package_name = 'nova-compute' $conductor_package_name = 'nova-conductor' $novajoin_package_name = undef diff --git a/spec/classes/nova_client_spec.rb b/spec/classes/nova_client_spec.rb index 66862ecb0..a714dce18 100644 --- a/spec/classes/nova_client_spec.rb +++ b/spec/classes/nova_client_spec.rb @@ -29,15 +29,7 @@ describe 'nova::client' do when 'Debian' { :client_package_name => 'python3-novaclient' } when 'RedHat' - if facts[:operatingsystem] == 'Fedora' - { :client_package_name => 'python3-novaclient' } - else - if facts[:operatingsystemmajrelease] > '7' - { :client_package_name => 'python3-novaclient' } - else - { :client_package_name => 'python-novaclient' } - end - end + { :client_package_name => 'python3-novaclient' } end end diff --git a/spec/classes/nova_metadata_novajoin_api_spec.rb b/spec/classes/nova_metadata_novajoin_api_spec.rb index f272051f3..5aa6dcf43 100644 --- a/spec/classes/nova_metadata_novajoin_api_spec.rb +++ b/spec/classes/nova_metadata_novajoin_api_spec.rb @@ -206,15 +206,7 @@ describe 'nova::metadata::novajoin::api' do it_behaves_like 'nova::metadata::novajoin::api' it_behaves_like 'nova::metadata::novajoin::api on RedHat' let (:platform_params) do - if facts[:operatingsystem] == 'Fedora' - { :novajoin_package_name => 'python3-novajoin' } - else - if facts[:operatingsystemmajrelease] > '7' - { :novajoin_package_name => 'python3-novajoin' } - else - { :novajoin_package_name => 'python-novajoin' } - end - end + { :novajoin_package_name => 'python3-novajoin' } end end end