openstack/puppet-openstack-integration
Code Issues Proposed changes

Revert "Disable Telemetry testing on Ubuntu"

Browse Source 
Package has been fixed in Ubuntu.
This reverts commit 90be8c8f2b.

Change-Id: I9dfaffa1a964ebeb4af10e169b3cf19737724ff1
This commit is contained in:
Emilien Macchi
2016-09-30 20:29:28 +00:00
parent a8a04c3d6c
commit 206041e40e
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fixtures/scenario001.pp
View File

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