From 6761b3a5cf77612e0d24d12e57396407f6198a0f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 3 Mar 2016 14:11:06 -0500 Subject: [PATCH] Fix CI status on both ubuntu/centos Both changes need to happen in the same patchset. 1/ centos/workaround: make sure Keystone installed before RabbitMQ We currently have an issue in Puppet OpenStack CI where DIB image for centos7 has a modified version of /etc/login.defs that allows RabbitMQ to steal UID of OpenStack packaging (Keystone most often). While we are investigating that, this patch is a workaround to make sure we first install Keystone and then RabbitMQ, on centos7 systems. 2/ disable telemetry tests on Ubuntu. UCA is currently updating Ceilometer / Aodh and tests are broken now. Let's skip them. Change-Id: Ibfc3988a4de47c9d7d97159e7d1c0e57d64979ae --- fixtures/scenario001.pp | 17 +++++++++++++++-- manifests/init.pp | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) 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' |> } }