openstack
/
puppet-tempest
Code Issues Proposed changes

Merge "Use telemetry-tempest plugin for telemetry projects"

This commit is contained in:
Zuul 2018-01-18 17:58:31 +00:00 committed by Gerrit Code Review
parent 3f694032a9 bdc41f2cba
commit 683fce59a5
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
manifests/init.pp
View File

@ -584,17 +584,10 @@ the future release. Please use tempest::package_ensure instead.")
}
if $manage_tests_packages {
if $aodh_available and $::tempest::params::python_aodh_tests {
package { 'python-aodh-tests':
if ($aodh_available or $ceilometer_available or $panko_available or $gnocchi_available) and $::tempest::params::python_telemetry_tests {
package { 'python-telemetry-tests':
ensure => present,
name => $::tempest::params::python_aodh_tests,
tag => ['openstack', 'tempest-package'],
}
}
if $ceilometer_available and $::tempest::params::python_ceilometer_tests {
package { 'python-ceilometer-tests':
ensure => present,
name => $::tempest::params::python_ceilometer_tests,
name => $::tempest::params::python_telemetry_tests,
tag => ['openstack', 'tempest-package'],
}
}
@ -612,20 +605,6 @@ the future release. Please use tempest::package_ensure instead.")
tag => ['openstack', 'tempest-package'],
}
}
if $gnocchi_available and $::tempest::params::python_gnocchi_tests {
package { 'python-gnocchi-tests':
ensure => present,
name => $::tempest::params::python_gnocchi_tests,
tag => ['openstack', 'tempest-package'],
}
}
if $panko_available and $::tempest::params::python_panko_tests {
package { 'python-panko-tests':
ensure => present,
name => $::tempest::params::python_panko_tests,
tag => ['openstack', 'tempest-package'],
}
}
if $heat_available and $::tempest::params::python_heat_tests {
package { 'python-heat-tests':
ensure => present,

5
manifests/params.pp
View File

@ -12,13 +12,11 @@ class tempest::params {
'patch',
'gcc'
]
$python_aodh_tests = 'python-aodh-tests'
$python_telemetry_tests = 'python-telemetry-tests-tempest'
$python_bgpvpn_tests = 'python-networking-bgpvpn-tests-tempest'
$python_ceilometer_tests = 'python-ceilometer-tests'
$python_cinder_tests = 'python-cinder-tests'
$python_designate_tests = 'python-designate-tests-tempest'
$python_glance_tests = 'python-glance-tests'
$python_gnocchi_tests = 'python-gnocchi-tests'
$python_heat_tests = 'python-heat-tests'
$python_horizon_tests = 'python-horizon-tests-tempest'
$python_ironic_tests = 'python-ironic-tests-tempest'
@ -39,7 +37,6 @@ class tempest::params {
$python_watcher_tests = 'python-watcher-tests-tempest'
$python_zaqar_tests = 'python-zaqar-tests-tempest'
$python_congress_tests = 'python-congress-tests'
$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'