openstack/puppet-aodh
Code Issues Proposed changes

Merge "Fix rpc_backend option warning"

Browse Source
This commit is contained in:
Jenkins 2017-08-12 18:01:03 +00:00 committed by Gerrit Code Review
commit f6ef8011f8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -262,7 +262,7 @@
# amqp (for AMQP 1.0 protocol) # amqp (for AMQP 1.0 protocol)
# rabbit (for rabbitmq) # rabbit (for rabbitmq)
# zmq (for zeromq) # zmq (for zeromq)
# Defaults to 'rabbit' # Defaults to undef
# #
class aodh ( class aodh (
$package_ensure = 'present', $package_ensure = 'present',
@ -323,7 +323,7 @@ class aodh (
$rabbit_userid = $::os_service_default, $rabbit_userid = $::os_service_default,
$rabbit_virtual_host = $::os_service_default, $rabbit_virtual_host = $::os_service_default,
$ensure_package = undef, $ensure_package = undef,
$rpc_backend = 'rabbit', $rpc_backend = undef,
) inherits aodh::params { ) inherits aodh::params {
include ::aodh::deps include ::aodh::deps
@ -336,7 +336,7 @@ class aodh (
!is_service_default($rabbit_port) or !is_service_default($rabbit_port) or
!is_service_default($rabbit_userid) or !is_service_default($rabbit_userid) or
!is_service_default($rabbit_virtual_host) or !is_service_default($rabbit_virtual_host) or
!is_service_default($rpc_backend) { $rpc_backend {
warning("aodh::rabbit_host, aodh::rabbit_hosts, aodh::rabbit_password, \ warning("aodh::rabbit_host, aodh::rabbit_hosts, aodh::rabbit_password, \
aodh::rabbit_port, aodh::rabbit_userid, aodh::rabbit_virtual_host and \ aodh::rabbit_port, aodh::rabbit_userid, aodh::rabbit_virtual_host and \
aodh::rpc_backend are deprecated. Please use aodh::default_transport_url \ aodh::rpc_backend are deprecated. Please use aodh::default_transport_url \