6761b3a5cf
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
55 lines
1.5 KiB
Puppet
55 lines
1.5 KiB
Puppet
#
|
|
# Copyright 2015 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
include ::openstack_integration
|
|
include ::openstack_integration::rabbitmq
|
|
include ::openstack_integration::mysql
|
|
include ::openstack_integration::keystone
|
|
class { '::openstack_integration::glance':
|
|
backend => 'rbd',
|
|
}
|
|
include ::openstack_integration::neutron
|
|
class { '::openstack_integration::nova':
|
|
libvirt_rbd => true,
|
|
}
|
|
class { '::openstack_integration::cinder':
|
|
backend => 'rbd',
|
|
}
|
|
include ::openstack_integration::ceilometer
|
|
include ::openstack_integration::aodh
|
|
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,
|
|
}
|