From c0fe8c85eea08f3b29be32c1c287f9dd11c8d01a Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 19 Apr 2016 14:21:09 -0400
Subject: [PATCH] scenario001: test telemetry on Ubuntu again

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

Change-Id: I7b1d710de9d98b8695b851e8e07aa4fcda092034
---
 fixtures/scenario001.pp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index d52b5448a..cfdd24e98 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -51,21 +51,8 @@ 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 => $telemetry_enabled,
-  aodh       => $telemetry_enabled,
+  ceilometer => true,
+  aodh       => true,
 }