openstack
/
puppet-tempest
Code Issues Proposed changes

Merge "Remove Neutron LBaaS"

This commit is contained in:
Zuul 2019-06-12 02:07:32 +00:00 committed by Gerrit Code Review
parent 810ab64f68 af6be7261e
commit 363222aea1
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/init.pp
View File

@ -139,8 +139,6 @@
# Defaults to false
# [*neutron_fwaas_available*]
# Defaults to true
# [*neutron_lbaas_available*]
# Defaults to true
# [*neutron_l2gw_available*]
# Defaults to true
# [*neutron_vpnaas_available*]
@ -329,7 +327,6 @@ class tempest(
$neutron_available = false,
$neutron_bgpvpn_available = false,
$neutron_fwaas_available = true,
$neutron_lbaas_available = true,
$neutron_l2gw_available = false,
$neutron_vpnaas_available = false,
$neutron_dr_available = false,
@ -661,13 +658,6 @@ class tempest(
tag => ['openstack', 'tempest-package'],
}
}
if $neutron_lbaas_available {
package { 'python-neutron-lbaas-tests':
ensure => present,
name => $::tempest::params::python_lbaas_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

@ -29,7 +29,6 @@ class tempest::params {
$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_lbaas_tests = "python${pyvers}-neutron-lbaas-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"

1
spec/classes/tempest_init_spec.rb
View File

@ -404,7 +404,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-lbaas-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') } }