openstack
/
puppet-tempest
Code Issues Proposed changes

Remove neutron-fwaas tempest plugin installation 

After [1] and [2], fwaas tempest plugin is integrated in neutron-tempest-plugin
so no additional package installation is needed.

This patch removes old fwaas tempest plugin installation. It keeps the
parameter in the manifest for backward compatibility of manifest using
it.

[1] https://review.opendev.org/#/c/643668/
[2] https://review.opendev.org/#/c/643662/

Change-Id: If2115f59657a1b6c8c8c1541f8f78f9b9103a885
This commit is contained in:
Alfredo Moralejo 2019-08-19 18:52:23 +02:00
parent 0c43f799f7
commit 30ab1da275
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/init.pp
View File

@ -137,8 +137,6 @@
# Defaults to false
# [*neutron_bgpvpn_available*]
# Defaults to false
# [*neutron_fwaas_available*]
# Defaults to true
# [*neutron_l2gw_available*]
# Defaults to true
# [*neutron_vpnaas_available*]
@ -225,6 +223,9 @@
# Defaults to undef
# [*allow_tenant_isolation*]
# Defaults to undef
# [*neutron_fwaas_available*]
# Just for backwards compatibility, it actually does nothing as fwaas plugin
# is integrated in neutron tempest plugin.
#
class tempest(
$package_ensure = 'present',
@ -326,7 +327,6 @@ class tempest(
$horizon_available = true,
$neutron_available = false,
$neutron_bgpvpn_available = false,
$neutron_fwaas_available = true,
$neutron_l2gw_available = false,
$neutron_vpnaas_available = false,
$neutron_dr_available = false,
@ -366,6 +366,7 @@ class tempest(
$alt_tenant_name = undef,
$admin_tenant_name = undef,
$allow_tenant_isolation = undef,
$neutron_fwaas_available = undef,
) {
if !is_service_default($tempest_roles) and !empty($tempest_roles){
@ -407,6 +408,10 @@ class tempest(
$use_dynamic_credentials_real = $use_dynamic_credentials
}
if $neutron_fwaas_available {
warning('The tempest::neutron_fwaas_available parameter is deprecated. FWaaS plugin is now part of neutron plugin.')
}
include ::tempest::params
include ::openstacklib::openstackclient
@ -651,13 +656,6 @@ class tempest(
name => $::tempest::params::python_neutron_tests,
tag => ['openstack', 'tempest-package'],
}
if $neutron_fwaas_available {
package { 'python-neutron-fwaas-tests':
ensure => present,
name => $::tempest::params::python_fwaas_tests,
tag => ['openstack', 'tempest-package'],
}
}
if $neutron_l2gw_available and $::tempest::params::python_l2gw_tests {
package { 'python-networking-l2gw-tests-tempest':
ensure => present,

1
manifests/params.pp
View File

@ -28,7 +28,6 @@ class tempest::params {
$python_vitrage_tests = "python${pyvers}-vitrage-tests-tempest"
$python_murano_tests = "python${pyvers}-murano-tests-tempest"
$python_neutron_tests = "python${pyvers}-neutron-tests-tempest"
$python_fwaas_tests = "python${pyvers}-neutron-fwaas-tests"
$python_l2gw_tests = "python${pyvers}-networking-l2gw-tests-tempest"
$python_vpnaas_tests = "python${pyvers}-neutron-vpnaas-tests"
$python_dr_tests = "python${pyvers}-neutron-dynamic-routing-tests"

8
releasenotes/notes/Remove-fwaas-tempest-plugin-a2335d7d5c914b17.yaml Normal file
View File

@ -0,0 +1,8 @@
---
prelude: >
FWaaS tempest plugin has been moved from neutron-fwaas repo to the new
neutron-tempest-plugin.
deprecations:
- |
Parameter neutron_fwaas_available has been deprecated and it's does not
affect tempest plugins installation.

1
spec/classes/tempest_init_spec.rb
View File

@ -403,7 +403,6 @@ describe 'tempest' do
describe "should install neutron and *aas tests packages" do
it { expect { is_expected.to contain_package('python-neutron-tests') } }
it { expect { is_expected.to contain_package('python-neutron-fwaas-tests') } }
it { expect { is_expected.to contain_package('python-neutron-vpnaas-tests') } }
it { expect { is_expected.to contain_package('python-neutron-dynamic-routing-tests') } }
it { expect { is_expected.to contain_package('python-networking-l2gw-tests-tempest') } }