scenario001: test telemetry on Ubuntu again

Re-enable tests on Ubuntu for Telemetry (Ceilometer & Aodh).

Change-Id: I7b1d710de9d98b8695b851e8e07aa4fcda092034
This commit is contained in:
Emilien Macchi 2016-04-19 14:21:09 -04:00
parent 86b6b1f3c0
commit c0fe8c85ee

View File

@ -51,21 +51,8 @@ include ::openstack_integration::gnocchi
include ::openstack_integration::ceph include ::openstack_integration::ceph
include ::openstack_integration::provision include ::openstack_integration::provision
case $::osfamily {
'Debian': {
# UCA is being updated and Ceilometer is currently broken
$telemetry_enabled = false
}
'RedHat': {
$telemetry_enabled = true
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
class { '::openstack_integration::tempest': class { '::openstack_integration::tempest':
cinder => true, cinder => true,
ceilometer => $telemetry_enabled, ceilometer => true,
aodh => $telemetry_enabled, aodh => true,
} }