56794f300a
Canonical are packaging gnocchi-api package with apache and python3 by default. We cannot test it in CI since we cannot run py2 and py3 on the same node with apache wsgi. Canonical helped us by packaging python2 support back into python-gnocchi package so we change our wsgi usage to use this package and set the new wsgi script path. We still want users to be able to install only gnocchi-api since they might not run apache wsgi even though its installed by default. Adds installation of rados and redis packages for python3 when needed, this is because all gnocchi components will still be running in py3, also CLI such as gnocchi-upgrade but the gnocchi-api is in wsgi using py2. Because of that we still need to install the py2 packages. Enables acceptance testing for Debian based operating systems. Change-Id: I070f88dd40ca4129cbd3abf5b4f5ecb511b2895e
64 lines
1.8 KiB
Puppet
64 lines
1.8 KiB
Puppet
# 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.
|
|
|
|
# gnocchi::storage
|
|
#
|
|
# Storage backend for Gnocchi
|
|
#
|
|
# == Parameters
|
|
#
|
|
# [*package_ensure*]
|
|
# (optional) ensure state for package.
|
|
# Defaults to 'present'
|
|
#
|
|
# [*coordination_url*]
|
|
# (optional) The url to use for distributed group membership coordination.
|
|
# Defaults to $::os_service_default.
|
|
#
|
|
# [*metric_processing_delay*]
|
|
# (optional) Delay between processng metrics
|
|
# Defaults to $::os_service_default.
|
|
#
|
|
|
|
class gnocchi::storage(
|
|
$package_ensure = 'present',
|
|
$coordination_url = $::os_service_default,
|
|
$metric_processing_delay = $::os_service_default,
|
|
) inherits gnocchi::params {
|
|
|
|
include ::gnocchi::deps
|
|
|
|
if $coordination_url {
|
|
|
|
gnocchi_config {
|
|
'storage/coordination_url' : value => $coordination_url;
|
|
'storage/metric_processing_delay' : value => $metric_processing_delay;
|
|
}
|
|
|
|
if ($coordination_url =~ /^redis/ ) {
|
|
ensure_resource('package', 'python-redis', {
|
|
name => $::gnocchi::params::redis_package_name,
|
|
tag => 'openstack',
|
|
})
|
|
|
|
# NOTE(tobias.urdin): Gnocchi components are packaged with py3 in Ubuntu
|
|
# from Queens.
|
|
if $::operatingsystem == 'Ubuntu' {
|
|
ensure_resource('package', 'python3-redis', {
|
|
name => 'python3-redis',
|
|
tag => 'openstack',
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|