openstack/puppet-neutron
Code Issues Proposed changes

Use python3-* package on OS with python3 default

Browse Source 
Change-Id: I179748cbd6e9e8f66e1a3775cf78001b0da554cf
This commit is contained in:
Takashi Kajinami 2020-04-06 20:06:45 +09:00
parent 1e252b0df4
commit d9aec52f0d
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@ -39,7 +39,7 @@ class neutron::params {
$nsx_config_file = '/etc/neutron/plugins/vmware/nsx.ini' $nsx_config_file = '/etc/neutron/plugins/vmware/nsx.ini'
$sfc_package = "python${pyvers}-networking-sfc" $sfc_package = "python${pyvers}-networking-sfc"
$group = 'neutron' $group = 'neutron'
$mlnx_agent_package = 'python-networking-mlnx' $mlnx_agent_package = "python${pyvers}-networking-mlnx"
$eswitchd_service = 'eswitchd' $eswitchd_service = 'eswitchd'
if($::osfamily == 'Redhat') { if($::osfamily == 'Redhat') {
@ -131,7 +131,7 @@ class neutron::params {
$nvp_server_package = 'neutron-plugin-nicira' $nvp_server_package = 'neutron-plugin-nicira'
$dhcp_agent_package = 'neutron-dhcp-agent' $dhcp_agent_package = 'neutron-dhcp-agent'
$metering_agent_package = 'neutron-metering-agent' $metering_agent_package = 'neutron-metering-agent'
$vpnaas_agent_package = 'python-neutron-vpnaas' $vpnaas_agent_package = "python${pyvers}-neutron-vpnaas"
$openswan_package = 'strongswan' $openswan_package = 'strongswan'
$libreswan_package = false $libreswan_package = false
$metadata_agent_package = 'neutron-metadata-agent' $metadata_agent_package = 'neutron-metadata-agent'

16
spec/classes/neutron_agents_ml2_mlnx_spec.rb
View File

@ -113,16 +113,30 @@ describe 'neutron::agents::ml2::mlnx' do
case facts[:osfamily] case facts[:osfamily]
when 'Debian' when 'Debian'
{ {
:mlnx_agent_package => 'python-networking-mlnx', :mlnx_agent_package => 'python3-networking-mlnx',
:mlnx_agent_service => 'neutron-plugin-mlnx-agent' :mlnx_agent_service => 'neutron-plugin-mlnx-agent'
} }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{
:mlnx_agent_package => 'python3-networking-mlnx',
:mlnx_agent_service => 'neutron-mlnx-agent'
}
else
if facts[:operatingsystemmajrelease] > '7'
{
:mlnx_agent_package => 'python3-networking-mlnx',
:mlnx_agent_service => 'neutron-mlnx-agent'
}
else
{ {
:mlnx_agent_package => 'python-networking-mlnx', :mlnx_agent_package => 'python-networking-mlnx',
:mlnx_agent_service => 'neutron-mlnx-agent' :mlnx_agent_service => 'neutron-mlnx-agent'
} }
end end
end end
end
end
it_behaves_like 'neutron mlnx agent with ml2 plugin' it_behaves_like 'neutron mlnx agent with ml2 plugin'
end end

2
spec/classes/neutron_services_fwaas_spec.rb
View File

@ -119,7 +119,7 @@ describe 'neutron::services::fwaas' do
when 'Debian' when 'Debian'
{ {
:fwaas_package_name => 'python3-neutron-fwaas', :fwaas_package_name => 'python3-neutron-fwaas',
:vpnaas_package_name => 'python-neutron-vpnaas' :vpnaas_package_name => 'python3-neutron-vpnaas'
} }
when 'RedHat' when 'RedHat'
{ {

2
spec/classes/neutron_services_vpnaas_spec.rb
View File

@ -67,7 +67,7 @@ describe 'neutron::services::vpnaas' do
case facts[:osfamily] case facts[:osfamily]
when 'Debian' when 'Debian'
{ {
:vpnaas_package_name => 'python-neutron-vpnaas' :vpnaas_package_name => 'python3-neutron-vpnaas'
} }
when 'RedHat' when 'RedHat'
{ {