openstack
/
puppet-tempest
Code Issues Proposed changes

Merge "Added support for barbican tempest plugin"

This commit is contained in:
Jenkins 2017-07-23 09:44:59 +00:00 committed by Gerrit Code Review
parent 2e443cdf2f f173ce59ef
commit 7ec0238da0
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@ -173,6 +173,8 @@
# Defaults to false
# [*octavia_available*]
# Defaults to false
# [*barbican_available*]
# Defaults to false
# [*keystone_v2*]
# Defaults to true
# [*keystone_v3*]
@ -335,6 +337,7 @@ class tempest(
$vitrage_available = false,
$congress_available = false,
$octavia_available = false,
$barbican_available = false,
$keystone_v2 = true,
$keystone_v3 = true,
$auth_version = 'v2',
@ -783,6 +786,14 @@ the future release. Please use tempest::package_ensure instead.")
tag => ['openstack', 'tempest-package'],
}
}
if $barbican_available and $::tempest::params::python_barbican_tests {
package { 'python-barbican-tests-tempest':
ensure => present,
name => $::tempest::params::python_barbican_tests,
tag => ['openstack', 'tempest-package'],
}
}
}
if $configure_images {

2
manifests/params.pp
View File

@ -42,6 +42,7 @@ class tempest::params {
$python_panko_tests = 'python-panko-tests'
$python_octavia_tests = 'python-octavia-tests'
$python_ec2api_tests = 'python-ec2-api-tests'
$python_barbican_tests = 'python-barbican-tests-tempest'
$package_name = 'openstack-tempest'
}
'Debian': {
@ -82,6 +83,7 @@ class tempest::params {
$python_panko_tests = false
$python_octavia_tests = false
$python_ec2api_tests = false
$python_barbican_tests = false
$package_name = 'tempest'
}
default: {

1
spec/classes/tempest_init_spec.rb
View File

@ -268,6 +268,7 @@ describe 'tempest' do
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)
is_expected.to contain_tempest_config('whitebox/db_uri').with(:value => nil)
is_expected.to contain_tempest_config('cli/cli_dir').with(:value => nil)
is_expected.to contain_tempest_config('oslo_concurrency/lock_path').with(:value => '/var/lib/tempest')