openstack
/
puppet-tempest
Code Issues Proposed changes

Remove retired congress 

Change-Id: Ib5c4cf0b71c2d3908b3dd485b64391b07a6bb707
This commit is contained in:
Tobias Urdin 2020-05-30 09:17:08 +02:00
parent dee8f8745b
commit fe73b95a8a
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/init.pp
View File

@ -167,8 +167,6 @@
# Defaults to false
# [*ironic_available*]
# Defaults to false
# [*congress_available*]
# Defaults to false
# [*octavia_available*]
# Defaults to false
# [*barbican_available*]
@ -226,6 +224,8 @@
# [*neutron_fwaas_available*]
# Just for backwards compatibility, it actually does nothing as fwaas plugin
# is integrated in neutron tempest plugin.
# [*congress_available*]
# Defaults to undef
#
class tempest(
$package_ensure = 'present',
@ -341,7 +341,6 @@ class tempest(
$ec2api_available = false,
$mistral_available = false,
$vitrage_available = false,
$congress_available = false,
$octavia_available = false,
$barbican_available = false,
$keystone_v2 = false,
@ -367,6 +366,7 @@ class tempest(
$admin_tenant_name = undef,
$allow_tenant_isolation = undef,
$neutron_fwaas_available = undef,
$congress_available = undef,
) {
if !is_service_default($tempest_roles) and !empty($tempest_roles){
@ -576,7 +576,6 @@ class tempest(
'service_available/watcher': value => $watcher_available;
'service_available/zaqar': value => $zaqar_available;
'service_available/ec2api': value => $ec2api_available;
'service_available/congress': value => $congress_available;
'service_available/octavia': value => $octavia_available;
'whitebox/db_uri': value => $whitebox_db_uri;
'cli/cli_dir': value => $cli_dir;
@ -720,13 +719,6 @@ class tempest(
tag => ['openstack', 'tempest-package'],
}
}
if $congress_available and $::tempest::params::congress_congress_tests {
package { 'python-congress-tests':
ensure => present,
name => $::tempest::params::python_congress_tests,
tag => ['openstack', 'tempest-package'],
}
}
if $mistral_available and $::tempest::params::python_mistral_tests {
package { 'python-mistral-tests':
ensure => present,

3
manifests/params.pp
View File

@ -37,7 +37,6 @@ class tempest::params {
$python_trove_tests = "python${pyvers}-trove-tests-tempest"
$python_watcher_tests = "python${pyvers}-watcher-tests-tempest"
$python_zaqar_tests = "python${pyvers}-zaqar-tests-tempest"
$python_congress_tests = "python${pyvers}-congress-tests-tempest"
$python_octavia_tests = "python${pyvers}-octavia-tests-tempest"
$python_ec2api_tests = "python${pyvers}-ec2api-tests-tempest"
$python_barbican_tests = "python${pyvers}-barbican-tests-tempest"
@ -78,7 +77,6 @@ class tempest::params {
$python_trove_tests = false
$python_watcher_tests = 'watcher-tempest-plugin'
$python_zaqar_tests = 'zaqar-tempest-plugin'
$python_congress_tests = false
$python_octavia_tests = 'octavia-tempest-plugin'
$python_ec2api_tests = false
$python_barbican_tests = 'barbican-tempest-plugin'
@ -107,7 +105,6 @@ class tempest::params {
$python_trove_tests = false
$python_watcher_tests = false
$python_zaqar_tests = false
$python_congress_tests = false
$python_panko_tests = false
$python_octavia_tests = false
$python_ec2api_tests = false

4
releasenotes/notes/deprecate-congress-c6ac9a33a92b3cf9.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
The congress_available is now deprecated since Congress is retired.

1
spec/classes/tempest_init_spec.rb
View File

@ -263,7 +263,6 @@ describe 'tempest' do
is_expected.to contain_tempest_config('service_available/ironic').with(:value => false)
is_expected.to contain_tempest_config('service_available/watcher').with(:value => false)
is_expected.to contain_tempest_config('service_available/zaqar').with(:value => false)
is_expected.to contain_tempest_config('service_available/congress').with(:value => false)
is_expected.to contain_tempest_config('service_available/designate').with(:value => false)
is_expected.to contain_tempest_config('service_available/octavia').with(:value => false)
is_expected.to contain_tempest_config('service_available/barbican').with(:value => false)