Added watcher service

Change-Id: I05e9f15fa8c9a6ca1992a27120ba442b35bd0f98
This commit is contained in:
Daniel Pawlik 2016-11-20 19:24:56 +00:00
parent 185f4670cc
commit 24a1c4bf40
4 changed files with 17 additions and 0 deletions

View File

@ -128,6 +128,8 @@
# Defaults to true # Defaults to true
# [*murano_available*] # [*murano_available*]
# Defaults to false # Defaults to false
# [*watcher_available*]
# Defaults to false
# [*zaqar_available*] # [*zaqar_available*]
# Defaults to false # Defaults to false
# [*ec2api_available*] # [*ec2api_available*]
@ -288,6 +290,7 @@ class tempest(
$swift_available = false, $swift_available = false,
$trove_available = false, $trove_available = false,
$ironic_available = false, $ironic_available = false,
$watcher_available = false,
$zaqar_available = false, $zaqar_available = false,
$ec2api_available = false, $ec2api_available = false,
$mistral_available = false, $mistral_available = false,
@ -471,6 +474,7 @@ class tempest(
'service_available/swift': value => $swift_available; 'service_available/swift': value => $swift_available;
'service_available/trove': value => $trove_available; 'service_available/trove': value => $trove_available;
'service_available/ironic': value => $ironic_available; 'service_available/ironic': value => $ironic_available;
'service_available/watcher': value => $watcher_available;
'service_available/zaqar': value => $zaqar_available; 'service_available/zaqar': value => $zaqar_available;
'service_available/ec2api': value => $ec2api_available; 'service_available/ec2api': value => $ec2api_available;
'whitebox/db_uri': value => $whitebox_db_uri; 'whitebox/db_uri': value => $whitebox_db_uri;
@ -612,6 +616,13 @@ class tempest(
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],
} }
} }
if $watcher_available and $::tempest::params::python_watcher_tests {
package { 'python-watcher-tests-tempest':
ensure => present,
name => $::tempest::params::python_watcher_tests,
tag => ['openstack', 'tempest-package'],
}
}
if $zaqar_available and $::tempest::params::python_zaqar_tests { if $zaqar_available and $::tempest::params::python_zaqar_tests {
package { 'python-zaqar-tests': package { 'python-zaqar-tests':
ensure => present, ensure => present,

View File

@ -33,6 +33,7 @@ class tempest::params {
$python_sahara_tests = 'python-sahara-tests-tempest' $python_sahara_tests = 'python-sahara-tests-tempest'
$python_swift_tests = 'python-swift-tests' $python_swift_tests = 'python-swift-tests'
$python_trove_tests = 'python-trove-tests' $python_trove_tests = 'python-trove-tests'
$python_watcher_tests = 'python-watcher-tests-tempest'
$python_zaqar_tests = 'python-zaqar-tests' $python_zaqar_tests = 'python-zaqar-tests'
} }
'Debian': { 'Debian': {
@ -64,6 +65,7 @@ class tempest::params {
$python_sahara_tests = false $python_sahara_tests = false
$python_swift_tests = false $python_swift_tests = false
$python_trove_tests = false $python_trove_tests = false
$python_watcher_tests = false
$python_zaqar_tests = false $python_zaqar_tests = false
} }
default: { default: {

View File

@ -0,0 +1,3 @@
---
features:
- Add support for Watcher tests.

View File

@ -255,6 +255,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('service_available/swift').with(:value => false) is_expected.to contain_tempest_config('service_available/swift').with(:value => false)
is_expected.to contain_tempest_config('service_available/trove').with(:value => false) is_expected.to contain_tempest_config('service_available/trove').with(:value => false)
is_expected.to contain_tempest_config('service_available/ironic').with(:value => false) 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/zaqar').with(:value => false)
is_expected.to contain_tempest_config('service_available/designate').with(:value => false) is_expected.to contain_tempest_config('service_available/designate').with(:value => false)
is_expected.to contain_tempest_config('whitebox/db_uri').with(:value => nil) is_expected.to contain_tempest_config('whitebox/db_uri').with(:value => nil)