openstack
/
puppet-tripleo
Code Issues Proposed changes

Decouple swift-proxy from ceilometer packages 

This patch updates the swift proxy so that it only depends
on ceilometer if the ceilometer_api_enabled all-nodes-data hiera
setting has been set.

Also removes a parameter dependency where the
tripleo::profile::base::swift::proxy class was referencing
a puppet-ceilometer value from hiera (which can
also cause ceilometer dependencies).

Change-Id: I8d9f69f5e9160543b372bd9886800f16f625fdc6
Closes-bug: #1648736
(cherry picked from commit 93dc1078b4)
This commit is contained in:
Dan Prince 2016-12-09 09:37:41 +01:00 committed by Pradeep Kilambi
parent 57c4a52644
commit 705051f16b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/profile/base/swift/proxy.pp
View File

@ -39,12 +39,17 @@
# IP port for rabbitmq service
# Defaults to hiera('swift::proxy::ceilometer::rabbit_port', 5672)
#
# [*ceilometer_enabled*]
# Whether the ceilometer pipeline is enabled.
# Defaults to true
#
class tripleo::profile::base::swift::proxy (
$step = hiera('step'),
$memcache_servers = hiera('memcached_node_ips'),
$memcache_port = 11211,
$rabbit_hosts = hiera('rabbitmq_node_ips', undef),
$rabbit_port = hiera('swift::proxy::ceilometer::rabbit_port', 5672),
$step = hiera('step'),
$memcache_servers = hiera('memcached_node_ips'),
$memcache_port = 11211,
$rabbit_hosts = hiera('rabbitmq_node_ips', undef),
$rabbit_port = hiera('swift::proxy::ceilometer::rabbit_port', 5672),
$ceilometer_enabled = true,
) {
if $step >= 4 {
$swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
@ -63,8 +68,10 @@ class tripleo::profile::base::swift::proxy (
include ::swift::proxy::formpost
include ::swift::proxy::bulk
$swift_rabbit_hosts = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
class { '::swift::proxy::ceilometer':
rabbit_hosts => $swift_rabbit_hosts,
if $ceilometer_enabled {
class { '::swift::proxy::ceilometer':
rabbit_hosts => $swift_rabbit_hosts,
}
}
include ::swift::proxy::versioned_writes