Browse Source

Merge "Get rid of the $pyvers variable"

changes/78/793878/2
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
e2576fa00b
  1. 10
      manifests/params.pp
  2. 10
      spec/classes/nova_client_spec.rb
  3. 10
      spec/classes/nova_metadata_novajoin_api_spec.rb

10
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

10
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

10
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

Loading…
Cancel
Save