From 206041e40e4da115ede209e946a2eb427550bfad Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 30 Sep 2016 20:29:28 +0000
Subject: [PATCH] Revert "Disable Telemetry testing on Ubuntu"

Package has been fixed in Ubuntu.
This reverts commit 90be8c8f2b590074c71da922ac2355a9b11175b3.

Change-Id: I9dfaffa1a964ebeb4af10e169b3cf19737724ff1
---
 fixtures/scenario001.pp | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp
index 1d153a72b..a6b683716 100644
--- a/fixtures/scenario001.pp
+++ b/fixtures/scenario001.pp
@@ -33,13 +33,9 @@ case $::osfamily {
 # List of workarounds for Ubuntu Xenial:
 # - disable SSL
 if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
-  $ssl_enabled       = false
-  # Telemetry is broken on Ubuntu as usual.
-  # Aodh-API doesn't start, they're updating the package.
-  $telemetry_enabled = false
+  $ssl_enabled = false
 } else {
-  $ssl_enabled       = true
-  $telemetry_enabled = true
+  $ssl_enabled = true
 }
 
 include ::openstack_integration
@@ -62,11 +58,6 @@ class { '::openstack_integration::nova':
 class { '::openstack_integration::cinder':
   backend => 'rbd',
 }
-if $telemetry_enabled {
-  include ::openstack_integration::ceilometer
-  include ::openstack_integration::aodh
-  include ::openstack_integration::gnocchi
-}
 include ::openstack_integration::ceilometer
 include ::openstack_integration::aodh
 include ::openstack_integration::gnocchi
@@ -75,7 +66,7 @@ include ::openstack_integration::provision
 
 class { '::openstack_integration::tempest':
   cinder     => true,
-  gnocchi    => $telemetry_enabled,
-  ceilometer => $telemetry_enabled,
-  aodh       => $telemetry_enabled,
+  gnocchi    => $gnocchi_enabled,
+  ceilometer => true,
+  aodh       => true,
 }