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
This commit is contained in:
parent
fcb6d4cf79
commit
6761b3a5cf
@ -34,8 +34,21 @@ include ::openstack_integration::gnocchi
|
|||||||
include ::openstack_integration::ceph
|
include ::openstack_integration::ceph
|
||||||
include ::openstack_integration::provision
|
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':
|
class { '::openstack_integration::tempest':
|
||||||
cinder => true,
|
cinder => true,
|
||||||
ceilometer => true,
|
ceilometer => $telemetry_enabled,
|
||||||
aodh => true,
|
aodh => $telemetry_enabled,
|
||||||
}
|
}
|
||||||
|
@ -6,5 +6,8 @@ class openstack_integration {
|
|||||||
package { 'openstack-selinux':
|
package { 'openstack-selinux':
|
||||||
ensure => 'latest'
|
ensure => 'latest'
|
||||||
}
|
}
|
||||||
|
# temporary hack to make sure RabbitMQ does not steal UID
|
||||||
|
# of Keystone
|
||||||
|
Package<| title == 'keystone' |> -> Package<| title == 'rabbitmq-server' |>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user