Merge "Ceilometer: Test deployment with separate polling agents"
This commit is contained in:
commit
a93536c6ab
@ -79,11 +79,13 @@ if $ec2api_enabled {
|
||||
include openstack_integration::ec2api
|
||||
}
|
||||
|
||||
include openstack_integration::ceilometer
|
||||
class { 'openstack_integration::ceilometer':
|
||||
separate_polling => true,
|
||||
}
|
||||
include openstack_integration::aodh
|
||||
class { 'openstack_integration::gnocchi':
|
||||
integration_enable => true,
|
||||
backend => 'swift'
|
||||
backend => 'swift',
|
||||
}
|
||||
|
||||
class { 'openstack_integration::tempest':
|
||||
|
@ -8,9 +8,14 @@
|
||||
# (optional) Boolean to run integration tests.
|
||||
# Defaults to true.
|
||||
#
|
||||
# [*separate_polling*]
|
||||
# (optional) Use separate polling services for individual namespaces
|
||||
# Defaults to false
|
||||
#
|
||||
class openstack_integration::ceilometer (
|
||||
$compute_namespace = true,
|
||||
$integration_enable = true,
|
||||
$separate_polling = false,
|
||||
){
|
||||
|
||||
include openstack_integration::config
|
||||
@ -87,6 +92,7 @@ class openstack_integration::ceilometer (
|
||||
# NOTE(sileht): Use 1 minute instead 10 otherwise the telemetry tempest
|
||||
# tests are too long to pass in less than 1 hour.
|
||||
polling_interval => 60,
|
||||
separate_services => $separate_polling,
|
||||
}
|
||||
} else {
|
||||
# NOTE(tobias-urdin): When running the module tests we need to exclude the
|
||||
|
Loading…
Reference in New Issue
Block a user