Merge "Rename parameters for queue manager options"
This commit is contained in:
commit
03a0795b81
@ -102,15 +102,15 @@
|
|||||||
# cancel and notify consumers when queue is down.
|
# cancel and notify consumers when queue is down.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
# [*use_queue_manager*]
|
# [*rabbit_use_queue_manager*]
|
||||||
# (Optional) Should we use consistent queue names or random ones.
|
# (Optional) Should we use consistent queue names or random ones.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
# [*hostname*]
|
# [*rabbit_hostname*]
|
||||||
# (Optional) Hostname used by queue manager.
|
# (Optional) Hostname used by queue manager.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
# [*processname*]
|
# [*rabbit_processname*]
|
||||||
# (Optional) Process name used by queue manager.
|
# (Optional) Process name used by queue manager.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
@ -203,9 +203,9 @@ class aodh (
|
|||||||
$rabbit_quorum_max_memory_length = $facts['os_service_default'],
|
$rabbit_quorum_max_memory_length = $facts['os_service_default'],
|
||||||
$rabbit_quorum_max_memory_bytes = $facts['os_service_default'],
|
$rabbit_quorum_max_memory_bytes = $facts['os_service_default'],
|
||||||
$rabbit_enable_cancel_on_failover = $facts['os_service_default'],
|
$rabbit_enable_cancel_on_failover = $facts['os_service_default'],
|
||||||
$use_queue_manager = $facts['os_service_default'],
|
$rabbit_use_queue_manager = $facts['os_service_default'],
|
||||||
$hostname = $facts['os_service_default'],
|
$rabbit_hostname = $facts['os_service_default'],
|
||||||
$processname = $facts['os_service_default'],
|
$rabbit_processname = $facts['os_service_default'],
|
||||||
$rabbit_stream_fanout = $facts['os_service_default'],
|
$rabbit_stream_fanout = $facts['os_service_default'],
|
||||||
$kombu_ssl_ca_certs = $facts['os_service_default'],
|
$kombu_ssl_ca_certs = $facts['os_service_default'],
|
||||||
$kombu_ssl_certfile = $facts['os_service_default'],
|
$kombu_ssl_certfile = $facts['os_service_default'],
|
||||||
@ -256,9 +256,9 @@ class aodh (
|
|||||||
rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length,
|
rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length,
|
||||||
rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes,
|
rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes,
|
||||||
enable_cancel_on_failover => $rabbit_enable_cancel_on_failover,
|
enable_cancel_on_failover => $rabbit_enable_cancel_on_failover,
|
||||||
use_queue_manager => $use_queue_manager,
|
use_queue_manager => $rabbit_use_queue_manager,
|
||||||
hostname => $hostname,
|
hostname => $rabbit_hostname,
|
||||||
processname => $processname,
|
processname => $rabbit_processname,
|
||||||
rabbit_stream_fanout => $rabbit_stream_fanout,
|
rabbit_stream_fanout => $rabbit_stream_fanout,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -102,9 +102,9 @@ describe 'aodh' do
|
|||||||
:rabbit_quorum_max_memory_length => 5,
|
:rabbit_quorum_max_memory_length => 5,
|
||||||
:rabbit_quorum_max_memory_bytes => 1073741824,
|
:rabbit_quorum_max_memory_bytes => 1073741824,
|
||||||
:rabbit_enable_cancel_on_failover => false,
|
:rabbit_enable_cancel_on_failover => false,
|
||||||
:use_queue_manager => false,
|
:rabbit_use_queue_manager => false,
|
||||||
:hostname => 'node1.example.com',
|
:rabbit_hostname => 'node1.example.com',
|
||||||
:processname => 'procname',
|
:rabbit_processname => 'procname',
|
||||||
:rabbit_stream_fanout => false,
|
:rabbit_stream_fanout => false,
|
||||||
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
||||||
:notification_driver => 'ceilometer.compute.aodh_notifier',
|
:notification_driver => 'ceilometer.compute.aodh_notifier',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user