openstack/puppet-octavia
Code Issues Proposed changes

Debian is using python3-octaviaclient

Browse Source 
Change-Id: I0a3975def0a408eb1fc49b2ef29ccb7c29c1d6ab
This commit is contained in:
zhubingbing 2018-04-12 11:22:42 +08:00
parent 32a7483cad
commit 31f0bd4b60
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/params.pp
View File

@ -3,6 +3,12 @@
class octavia::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
$api_service_name = 'octavia-api'
$worker_service_name = 'octavia-worker'
$health_manager_service_name = 'octavia-health-manager'
@ -15,7 +21,7 @@ class octavia::params {
$worker_package_name = 'openstack-octavia-worker'
$health_manager_package_name = 'openstack-octavia-health-manager'
$housekeeping_package_name = 'openstack-octavia-housekeeping'
$client_package_name = 'python-octaviaclient'
$client_package_name = "python${pyvers}-octaviaclient"
}
'Debian': {
$common_package_name = 'octavia-common'
@ -23,7 +29,7 @@ class octavia::params {
$worker_package_name = 'octavia-worker'
$health_manager_package_name = 'octavia-health-manager'
$housekeeping_package_name = 'octavia-housekeeping'
$client_package_name = 'python-octaviaclient'
$client_package_name = "python${pyvers}-octaviaclient"
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")

15
spec/classes/octavia_client_spec.rb
View File

@ -19,7 +19,7 @@ describe 'octavia::client' do
it 'installs octavia client package' do
is_expected.to contain_package('python-octaviaclient').with(
:name => 'python-octaviaclient',
:name => platform_params[:client_package_name],
:ensure => p[:package_ensure],
:tag => 'openstack'
)
@ -35,6 +35,19 @@ describe 'octavia::client' do
facts.merge!(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-octaviaclient' }
else
{ :client_package_name => 'python-octaviaclient' }
end
when 'RedHat'
{ :client_package_name => 'python-octaviaclient' }
end
end
it_behaves_like 'octavia client'
end
end