Browse Source

Merge "Get rid of the $pyvers variable"

master
Zuul 5 days ago
committed by Gerrit Code Review
parent
commit
bb20fc25d5
4 changed files with 7 additions and 32 deletions
  1. +4
    -5
      manifests/params.pp
  2. +1
    -9
      spec/classes/swift_client_spec.rb
  3. +1
    -9
      spec/classes/swift_proxy_ceilometer_spec.rb
  4. +1
    -9
      spec/classes/swift_proxy_cname_lookup_spec.rb

+ 4
- 5
manifests/params.pp View File

@ -4,10 +4,9 @@
#
class swift::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-swiftclient"
$dnspython_pakage_name = "python${pyvers}-dnspython"
$client_package = 'python3-swiftclient'
$dnspython_pakage_name = 'python3-dnspython'
$service_provider = undef
case $::osfamily {
@ -35,7 +34,7 @@ class swift::params {
$account_auditor_service_name = 'swift-account-auditor'
$account_reaper_service_name = 'swift-account-reaper'
$account_replicator_service_name = 'swift-account-replicator'
$ceilometermiddleware_package_name = "python${pyvers}-ceilometermiddleware"
$ceilometermiddleware_package_name = 'python3-ceilometermiddleware'
}
'RedHat': {
$package_name = 'openstack-swift'
@ -61,7 +60,7 @@ class swift::params {
$account_auditor_service_name = 'openstack-swift-account-auditor'
$account_reaper_service_name = 'openstack-swift-account-reaper'
$account_replicator_service_name = 'openstack-swift-account-replicator'
$ceilometermiddleware_package_name = "python${pyvers}-ceilometermiddleware"
$ceilometermiddleware_package_name = 'python3-ceilometermiddleware'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \


+ 1
- 9
spec/classes/swift_client_spec.rb View File

@ -43,15 +43,7 @@ describe 'swift::client' do
when 'Debian'
{ :client_package_name => 'python3-swiftclient' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :client_package_name => 'python3-swiftclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package_name => 'python3-swiftclient' }
else
{ :client_package_name => 'python-swiftclient' }
end
end
{ :client_package_name => 'python3-swiftclient' }
end
end


+ 1
- 9
spec/classes/swift_proxy_ceilometer_spec.rb View File

@ -121,15 +121,7 @@ describe 'swift::proxy::ceilometer' do
when 'Debian'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
else
{ :ceilometermiddleware_package_name => 'python-ceilometermiddleware' }
end
end
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
end
end


+ 1
- 9
spec/classes/swift_proxy_cname_lookup_spec.rb View File

@ -56,15 +56,7 @@ describe 'swift::proxy::cname_lookup' do
when 'Debian'
{ :dnspython_package_name => 'python3-dnspython' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :dnspython_package_name => 'python3-dnspython' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :dnspython_package_name => 'python3-dnspython' }
else
{ :dnspython_package_name => 'python-dnspython' }
end
end
{ :dnspython_package_name => 'python3-dnspython' }
end
end


Loading…
Cancel
Save