openstack
/
puppet-neutron
Code Issues Proposed changes

Expect python3 package in CentOS8 

In CentOS, we expect to have python3 package in 8.x while we expect to
have python2 in 7.x .
Fix unit tests to expect the correct version according to os major
version.

Incorrect version handling about libreswan/openswan package is also
fixed so that we have correct one in CentOS8.

In addition, this patch updates test scope in tempest execution in
tripleo job to avoid timeout error caused by many long-running tests.

Closes-Bug: #1870257
Change-Id: I72302b58161edccb15ca008e11c670caaf94edaf
This commit is contained in:
Takashi Kajinami 2020-03-31 17:02:58 +09:00
parent 616913ff9d
commit f7bc1dc4f2
9 changed files with 87 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@ -21,5 +21,7 @@
featureset_override:
run_tempest: false
tempest_test_whitelist:
- 'network'
- 'tempest.api.network'
- 'tempest.scenario.test_network_basic_ops'
- 'neutron_tempest_plugin.api'
use_os_tempest: true

8
manifests/params.pp
View File

@ -75,10 +75,14 @@ class neutron::params {
$ovn_metadata_agent_package = "python${pyvers}-networking-ovn-metadata-agent"
$dynamic_routing_package = false
$bgp_dragent_package = 'openstack-neutron-bgp-dragent'
if $::operatingsystemrelease =~ /^7.*/ or $::operatingsystem == 'Fedora' {
if $::operatingsystem == 'Fedora' {
$openswan_package = 'libreswan'
} else {
$openswan_package = 'openswan'
if $::operatingsystemmajrelease >= '7' {
$openswan_package = 'libreswan'
} else {
$openswan_package = 'openswan'
}
}
$libreswan_package = 'libreswan'
$metadata_agent_package = false

22
spec/classes/neutron_agents_ml2_vpp_spec.rb
View File

@ -97,15 +97,21 @@ describe 'neutron::agents::ml2::vpp' do
let :platform_params do
case facts[:osfamily]
when 'Debian'
{
:vpp_plugin_package => 'python3-networking-vpp',
:vpp_agent_service => 'neutron-vpp-agent'
}
{ :vpp_plugin_package => 'python3-networking-vpp',
:vpp_agent_service => 'neutron-vpp-agent' }
when 'RedHat'
{
:vpp_plugin_package => 'python-networking-vpp',
:vpp_agent_service => 'neutron-vpp-agent'
}
if facts[:operatingsystem] == 'Fedora'
{ :vpp_plugin_package => 'python3-networking-vpp',
:vpp_agent_service => 'neutron-vpp-agent' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :vpp_plugin_package => 'python3-networking-vpp',
:vpp_agent_service => 'neutron-vpp-agent' }
else
{ :vpp_plugin_package => 'python-networking-vpp',
:vpp_agent_service => 'neutron-vpp-agent' }
end
end
end
end

16
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@ -120,10 +120,18 @@ describe 'neutron::agents::ovn_metadata' do
:ovn_metadata_agent_service => 'networking-ovn-metadata-agent'
}
when 'RedHat'
{
:ovn_metadata_agent_package => 'python-networking-ovn-metadata-agent',
:ovn_metadata_agent_service => 'networking-ovn-metadata-agent'
}
if facts[:operatingsystem] == 'Fedora'
{ :ovn_metadata_agent_package => 'python3-networking-ovn-metadata-agent',
:ovn_metadata_agent_service => 'networking-ovn-metadata-agent' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :ovn_metadata_agent_package => 'python3-networking-ovn-metadata-agent',
:ovn_metadata_agent_service => 'networking-ovn-metadata-agent' }
else
{ :ovn_metadata_agent_package => 'python-networking-ovn-metadata-agent',
:ovn_metadata_agent_service => 'networking-ovn-metadata-agent' }
end
end
end
end

10
spec/classes/neutron_client_spec.rb
View File

@ -29,7 +29,15 @@ describe 'neutron::client' do
when 'Debian'
{ :client_package => 'python3-neutronclient' }
when 'RedHat'
{ :client_package => 'python-neutronclient' }
if facts[:operatingsystem] == 'Fedora'
{ :client_package => 'python3-neutronclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package => 'python3-neutronclient' }
else
{ :client_package => 'python-neutronclient' }
end
end
end
end

15
spec/classes/neutron_plugins_ml2_bagpipe_spec.rb
View File

@ -20,6 +20,7 @@ describe 'neutron::plugins::ml2::bagpipe' do
it 'should have' do
should contain_package('python-networking-bagpipe').with(
:name => platform_params[:bagpipe_package_name],
:ensure => params[:package_ensure],
:tag => 'openstack'
)
@ -41,10 +42,18 @@ describe 'neutron::plugins::ml2::bagpipe' do
let (:platform_params) do
case facts[:osfamily]
when 'RedHat'
{ :bagpipe_package_name => 'python-networking-bagpipe' }
when 'Debian'
{ :bagpipe_package_name => 'python-networking-bagpipe' }
{ :bagpipe_package_name => 'python3-networking-bagpipe' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :bagpipe_package_name => 'python3-networking-bagpipe' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :bagpipe_package_name => 'python3-networking-bagpipe' }
else
{ :bagpipe_package_name => 'python-networking-bagpipe' }
end
end
end
end
it_behaves_like 'neutron plugin bagpipe ml2'

12
spec/classes/neutron_services_bgpvpn_spec.rb
View File

@ -77,10 +77,18 @@ describe 'neutron::services::bgpvpn' do
let (:platform_params) do
case facts[:osfamily]
when 'RedHat'
{ :bgpvpn_package_name => 'python-networking-bgpvpn' }
when 'Debian'
{ :bgpvpn_package_name => 'python3-networking-bgpvpn' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :bgpvpn_package_name => 'python3-networking-bgpvpn' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :bgpvpn_package_name => 'python3-networking-bgpvpn' }
else
{ :bgpvpn_package_name => 'python-networking-bgpvpn' }
end
end
end
end
it_behaves_like 'neutron bgpvpn service plugin'

14
spec/classes/neutron_services_l2gw_spec.rb
View File

@ -101,10 +101,18 @@ describe 'neutron::services::l2gw' do
let (:platform_params) do
case facts[:osfamily]
when 'RedHat'
{ :l2gw_agent_package_name => 'python2-networking-l2gw' }
when 'Debian'
{ :l2gw_agent_package_name => 'python-networking-l2gw' }
{ :l2gw_agent_package_name => 'python3-networking-l2gw' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :l2gw_agent_package_name => 'python3-networking-l2gw' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :l2gw_agent_package_name => 'python3-networking-l2gw' }
else
{ :l2gw_agent_package_name => 'python-networking-l2gw' }
end
end
end
end

12
spec/classes/neutron_services_sfc_spec.rb
View File

@ -83,10 +83,18 @@ describe 'neutron::services::sfc' do
let (:platform_params) do
case facts[:osfamily]
when 'RedHat'
{ :sfc_package_name => 'python-networking-sfc' }
when 'Debian'
{ :sfc_package_name => 'python3-networking-sfc' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :sfc_package_name => 'python3-networking-sfc' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :sfc_package_name => 'python3-networking-sfc' }
else
{ :sfc_package_name => 'python-networking-sfc' }
end
end
end
end
it_behaves_like 'neutron sfc service plugin'