diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index 68bc902b1..6ebbbe4b3 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -34,8 +34,21 @@ include ::openstack_integration::gnocchi include ::openstack_integration::ceph 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': cinder => true, - ceilometer => true, - aodh => true, + ceilometer => $telemetry_enabled, + aodh => $telemetry_enabled, } diff --git a/manifests/init.pp b/manifests/init.pp index 749c6a077..5bb35aa92 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -6,5 +6,8 @@ class openstack_integration { package { 'openstack-selinux': ensure => 'latest' } + # temporary hack to make sure RabbitMQ does not steal UID + # of Keystone + Package<| title == 'keystone' |> -> Package<| title == 'rabbitmq-server' |> } }