Remove queue options from api class
These were deprecated so that the options can be defined in the common
base class shared between the barbican services[1].
[1] c72177cc26
Related-Bug: #1883034
Change-Id: I6530a7c567b2a61ab6bf41c777e2d96680588040
This commit is contained in:
Takashi Kajinami
242
manifests/api.pp
242
manifests/api.pp
@@ -101,164 +101,6 @@
|
|||||||
# (Optional) Default page size for the 'limit' paging URL parameter.
|
# (Optional) Default page size for the 'limit' paging URL parameter.
|
||||||
# Defaults to $facts['os_service_default']
|
# Defaults to $facts['os_service_default']
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*default_transport_url*]
|
|
||||||
# (optional) Connection url for oslo messaging backend. An example rabbit url
|
|
||||||
# would be, rabbit://user:pass@host:port/virtual_host
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*rpc_response_timeout*]
|
|
||||||
# (Optional) Seconds to wait for a response from a call.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*control_exchange*]
|
|
||||||
# (Optional) The default exchange under which topics are scoped. May be
|
|
||||||
# overridden by an exchange name specified in the transport_url
|
|
||||||
# option.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*notification_transport_url*]
|
|
||||||
# (optional) Connection url for oslo messaging notifications backend. An
|
|
||||||
# example rabbit url would be, rabbit://user:pass@host:port/virtual_host
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*notification_driver*]
|
|
||||||
# (optional) Driver to use for oslo messaging notifications backend.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*notification_topics*]
|
|
||||||
# (optional) Topics to use for oslo messaging notifications backend.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*notification_retry*]
|
|
||||||
# (optional) The maximum number of attempts to re-sent a notification
|
|
||||||
# message, which failed to be delivered due to a recoverable error.
|
|
||||||
# Defaults to $facts['os_service_default'].
|
|
||||||
#
|
|
||||||
# [*rabbit_use_ssl*]
|
|
||||||
# (optional) Connect over SSL for RabbitMQ
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_ha_queues*]
|
|
||||||
# (optional) Use HA queues in RabbitMQ.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_quorum_queue*]
|
|
||||||
# (Optional) Use quorum queues in RabbitMQ.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_transient_quorum_queue*]
|
|
||||||
# (Optional) Use quorum queues for transients queues in RabbitMQ.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_quorum_delivery_limit*]
|
|
||||||
# (Optional) Each time a message is rdelivered to a consumer, a counter is
|
|
||||||
# incremented. Once the redelivery count exceeds the delivery limit
|
|
||||||
# the message gets dropped or dead-lettered.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_quorum_max_memory_length*]
|
|
||||||
# (Optional) Limit the number of messages in the quorum queue.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_quorum_max_memory_bytes*]
|
|
||||||
# (Optional) Limit the number of memory bytes used by the quorum queue.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_enable_cancel_on_failover*]
|
|
||||||
# (Optional) Enable x-cancel-on-ha-failover flag so that rabbitmq server will
|
|
||||||
# cancel and notify consumers when queue is down.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_heartbeat_timeout_threshold*]
|
|
||||||
# (optional) Number of seconds after which the RabbitMQ broker is considered
|
|
||||||
# down if the heartbeat keepalive fails. Any value >0 enables heartbeats.
|
|
||||||
# Heartbeating helps to ensure the TCP connection to RabbitMQ isn't silently
|
|
||||||
# closed, resulting in missed or lost messages from the queue.
|
|
||||||
# (Requires kombu >= 3.0.7 and amqp >= 1.4.0)
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_heartbeat_rate*]
|
|
||||||
# (optional) How often during the rabbit_heartbeat_timeout_threshold period to
|
|
||||||
# check the heartbeat on RabbitMQ connection. (i.e. rabbit_heartbeat_rate=2
|
|
||||||
# when rabbit_heartbeat_timeout_threshold=60, the heartbeat will be checked
|
|
||||||
# every 30 seconds.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_heartbeat_in_pthread*]
|
|
||||||
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
|
|
||||||
# through a native python thread. By default if this
|
|
||||||
# option isn't provided the health check heartbeat will
|
|
||||||
# inherit the execution model from the parent process. By
|
|
||||||
# example if the parent process have monkey patched the
|
|
||||||
# stdlib by using eventlet/greenlet then the heartbeat
|
|
||||||
# will be run through a green thread.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*rabbit_qos_prefetch_count*]
|
|
||||||
# (Optional) Specifies the number of messages to prefetch.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*amqp_durable_queues*]
|
|
||||||
# (optional) Define queues as "durable" to rabbitmq.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*enable_queue*]
|
|
||||||
# (optional) Enable asynchronous queuing
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*queue_namespace*]
|
|
||||||
# (optional) Namespace for the queue
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*queue_topic*]
|
|
||||||
# (optional) Topic for the queue
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*queue_version*]
|
|
||||||
# (optional) Version for the task API
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*queue_server_name*]
|
|
||||||
# (optional) Server name for RPC service
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*kombu_ssl_ca_certs*]
|
|
||||||
# (optional) SSL certification authority file (valid only if SSL enabled).
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*kombu_ssl_certfile*]
|
|
||||||
# (optional) SSL cert file (valid only if SSL enabled).
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*kombu_ssl_keyfile*]
|
|
||||||
# (optional) SSL key file (valid only if SSL enabled).
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*kombu_ssl_version*]
|
|
||||||
# (optional) SSL version to use (valid only if SSL enabled).
|
|
||||||
# Valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may be
|
|
||||||
# available on some distributions.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*kombu_reconnect_delay*]
|
|
||||||
# (optional) How long to wait before reconnecting in response to an AMQP
|
|
||||||
# consumer cancel notification.
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*kombu_failover_strategy*]
|
|
||||||
# (Optional) Determines how the next RabbitMQ node is chosen in case the one
|
|
||||||
# we are currently connected to becomes unavailable. Takes effect only if
|
|
||||||
# more than one RabbitMQ node is provided in config. (string value)
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
# [*kombu_compression*]
|
|
||||||
# (optional) Possible values are: gzip, bz2. If not set compression will not
|
|
||||||
# be used. This option may notbe available in future versions. EXPERIMENTAL.
|
|
||||||
# (string value)
|
|
||||||
# Defaults to $facts['os_service_default']
|
|
||||||
#
|
|
||||||
class barbican::api (
|
class barbican::api (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$bind_host = '0.0.0.0',
|
$bind_host = '0.0.0.0',
|
||||||
@@ -280,39 +122,6 @@ class barbican::api (
|
|||||||
$max_request_body_size = $facts['os_service_default'],
|
$max_request_body_size = $facts['os_service_default'],
|
||||||
$max_limit_paging = $facts['os_service_default'],
|
$max_limit_paging = $facts['os_service_default'],
|
||||||
$default_limit_paging = $facts['os_service_default'],
|
$default_limit_paging = $facts['os_service_default'],
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$default_transport_url = undef,
|
|
||||||
$rpc_response_timeout = $facts['os_service_default'],
|
|
||||||
$control_exchange = $facts['os_service_default'],
|
|
||||||
$notification_transport_url = $facts['os_service_default'],
|
|
||||||
$notification_driver = $facts['os_service_default'],
|
|
||||||
$notification_topics = $facts['os_service_default'],
|
|
||||||
$notification_retry = $facts['os_service_default'],
|
|
||||||
$rabbit_use_ssl = $facts['os_service_default'],
|
|
||||||
$rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
|
|
||||||
$rabbit_heartbeat_rate = $facts['os_service_default'],
|
|
||||||
$rabbit_heartbeat_in_pthread = $facts['os_service_default'],
|
|
||||||
$rabbit_qos_prefetch_count = $facts['os_service_default'],
|
|
||||||
$rabbit_ha_queues = $facts['os_service_default'],
|
|
||||||
$rabbit_quorum_queue = $facts['os_service_default'],
|
|
||||||
$rabbit_transient_quorum_queue = $facts['os_service_default'],
|
|
||||||
$rabbit_quorum_delivery_limit = $facts['os_service_default'],
|
|
||||||
$rabbit_quorum_max_memory_length = $facts['os_service_default'],
|
|
||||||
$rabbit_quorum_max_memory_bytes = $facts['os_service_default'],
|
|
||||||
$rabbit_enable_cancel_on_failover = $facts['os_service_default'],
|
|
||||||
$amqp_durable_queues = $facts['os_service_default'],
|
|
||||||
$enable_queue = $facts['os_service_default'],
|
|
||||||
$queue_namespace = $facts['os_service_default'],
|
|
||||||
$queue_topic = $facts['os_service_default'],
|
|
||||||
$queue_version = $facts['os_service_default'],
|
|
||||||
$queue_server_name = $facts['os_service_default'],
|
|
||||||
$kombu_ssl_ca_certs = $facts['os_service_default'],
|
|
||||||
$kombu_ssl_certfile = $facts['os_service_default'],
|
|
||||||
$kombu_ssl_keyfile = $facts['os_service_default'],
|
|
||||||
$kombu_ssl_version = $facts['os_service_default'],
|
|
||||||
$kombu_reconnect_delay = $facts['os_service_default'],
|
|
||||||
$kombu_failover_strategy = $facts['os_service_default'],
|
|
||||||
$kombu_compression = $facts['os_service_default'],
|
|
||||||
) inherits barbican::params {
|
) inherits barbican::params {
|
||||||
|
|
||||||
include barbican::deps
|
include barbican::deps
|
||||||
@@ -337,57 +146,6 @@ class barbican::api (
|
|||||||
'DEFAULT/host_href': value => $host_href_real;
|
'DEFAULT/host_href': value => $host_href_real;
|
||||||
}
|
}
|
||||||
|
|
||||||
include barbican
|
|
||||||
if $::barbican::default_transport_url == undef or $default_transport_url {
|
|
||||||
warning("The queue parameters and oslo.messaging parameters have been deprecated. \
|
|
||||||
Use the parameters of the barbican class.")
|
|
||||||
|
|
||||||
oslo::messaging::rabbit {'barbican_config':
|
|
||||||
rabbit_use_ssl => $rabbit_use_ssl,
|
|
||||||
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
|
||||||
heartbeat_rate => $rabbit_heartbeat_rate,
|
|
||||||
heartbeat_in_pthread => $rabbit_heartbeat_in_pthread,
|
|
||||||
rabbit_qos_prefetch_count => $rabbit_qos_prefetch_count,
|
|
||||||
kombu_reconnect_delay => $kombu_reconnect_delay,
|
|
||||||
kombu_failover_strategy => $kombu_failover_strategy,
|
|
||||||
amqp_durable_queues => $amqp_durable_queues,
|
|
||||||
kombu_compression => $kombu_compression,
|
|
||||||
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
|
|
||||||
kombu_ssl_certfile => $kombu_ssl_certfile,
|
|
||||||
kombu_ssl_keyfile => $kombu_ssl_keyfile,
|
|
||||||
kombu_ssl_version => $kombu_ssl_version,
|
|
||||||
rabbit_ha_queues => $rabbit_ha_queues,
|
|
||||||
rabbit_quorum_queue => $rabbit_quorum_queue,
|
|
||||||
rabbit_transient_quorum_queue => $rabbit_transient_quorum_queue,
|
|
||||||
rabbit_quorum_delivery_limit => $rabbit_quorum_delivery_limit,
|
|
||||||
rabbit_quorum_max_memory_length => $rabbit_quorum_max_memory_length,
|
|
||||||
rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes,
|
|
||||||
enable_cancel_on_failover => $rabbit_enable_cancel_on_failover,
|
|
||||||
}
|
|
||||||
|
|
||||||
oslo::messaging::default { 'barbican_config':
|
|
||||||
transport_url => pick($default_transport_url, $facts['os_service_default']),
|
|
||||||
rpc_response_timeout => $rpc_response_timeout,
|
|
||||||
control_exchange => $control_exchange,
|
|
||||||
}
|
|
||||||
|
|
||||||
oslo::messaging::notifications { 'barbican_config':
|
|
||||||
driver => $notification_driver,
|
|
||||||
transport_url => $notification_transport_url,
|
|
||||||
topics => $notification_topics,
|
|
||||||
retry => $notification_retry,
|
|
||||||
}
|
|
||||||
|
|
||||||
# queue options
|
|
||||||
barbican_config {
|
|
||||||
'queue/enable': value => $enable_queue;
|
|
||||||
'queue/namespace': value => $queue_namespace;
|
|
||||||
'queue/topic': value => $queue_topic;
|
|
||||||
'queue/version': value => $queue_version;
|
|
||||||
'queue/server_name': value => $queue_server_name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# max allowed secret options
|
# max allowed secret options
|
||||||
barbican_config {
|
barbican_config {
|
||||||
'DEFAULT/max_allowed_secret_in_bytes': value => $max_allowed_secret_in_bytes;
|
'DEFAULT/max_allowed_secret_in_bytes': value => $max_allowed_secret_in_bytes;
|
||||||
|
|||||||
@@ -236,7 +236,6 @@ class barbican(
|
|||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
}
|
}
|
||||||
|
|
||||||
if $default_transport_url {
|
|
||||||
oslo::messaging::rabbit {'barbican_config':
|
oslo::messaging::rabbit {'barbican_config':
|
||||||
rabbit_use_ssl => $rabbit_use_ssl,
|
rabbit_use_ssl => $rabbit_use_ssl,
|
||||||
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold,
|
||||||
@@ -284,4 +283,3 @@ class barbican(
|
|||||||
'queue/server_name': value => $queue_server_name;
|
'queue/server_name': value => $queue_server_name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The parameters to customize the oslo.messaging library options and queue
|
||||||
|
options have been removed from the ``barbican::api`` class.
|
||||||
|
Use the parameters of the ``barbican`` class instead.
|
||||||
@@ -25,40 +25,8 @@ describe 'barbican::api' do
|
|||||||
|
|
||||||
let :default_params do
|
let :default_params do
|
||||||
{
|
{
|
||||||
:default_transport_url => '<SERVICE DEFAULT>',
|
|
||||||
:rpc_response_timeout => '<SERVICE DEFAULT>',
|
|
||||||
:control_exchange => '<SERVICE DEFAULT>',
|
|
||||||
:notification_transport_url => '<SERVICE DEFAULT>',
|
|
||||||
:notification_driver => '<SERVICE DEFAULT>',
|
|
||||||
:notification_topics => '<SERVICE DEFAULT>',
|
|
||||||
:notification_retry => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_use_ssl => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_heartbeat_timeout_threshold => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_heartbeat_rate => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_heartbeat_in_pthread => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_qos_prefetch_count => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_ha_queues => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_quorum_queue => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_transient_quorum_queue => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_quorum_delivery_limit => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_quorum_max_memory_length => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_quorum_max_memory_bytes => '<SERVICE DEFAULT>',
|
|
||||||
:rabbit_enable_cancel_on_failover => '<SERVICE DEFAULT>',
|
|
||||||
:amqp_durable_queues => '<SERVICE DEFAULT>',
|
|
||||||
:max_allowed_secret_in_bytes => '<SERVICE DEFAULT>',
|
:max_allowed_secret_in_bytes => '<SERVICE DEFAULT>',
|
||||||
:max_allowed_request_size_in_bytes => '<SERVICE DEFAULT>',
|
:max_allowed_request_size_in_bytes => '<SERVICE DEFAULT>',
|
||||||
:enable_queue => '<SERVICE DEFAULT>',
|
|
||||||
:queue_namespace => '<SERVICE DEFAULT>',
|
|
||||||
:queue_topic => '<SERVICE DEFAULT>',
|
|
||||||
:queue_version => '<SERVICE DEFAULT>',
|
|
||||||
:queue_server_name => '<SERVICE DEFAULT>',
|
|
||||||
:kombu_ssl_ca_certs => '<SERVICE DEFAULT>',
|
|
||||||
:kombu_ssl_certfile => '<SERVICE DEFAULT>',
|
|
||||||
:kombu_ssl_keyfile => '<SERVICE DEFAULT>',
|
|
||||||
:kombu_ssl_version => '<SERVICE DEFAULT>',
|
|
||||||
:kombu_reconnect_delay => '<SERVICE DEFAULT>',
|
|
||||||
:kombu_failover_strategy => '<SERVICE DEFAULT>',
|
|
||||||
:kombu_compression => '<SERVICE DEFAULT>',
|
|
||||||
:manage_service => true,
|
:manage_service => true,
|
||||||
:enabled => true,
|
:enabled => true,
|
||||||
:enabled_secretstore_plugins => ['<SERVICE DEFAULT>'],
|
:enabled_secretstore_plugins => ['<SERVICE DEFAULT>'],
|
||||||
@@ -77,40 +45,8 @@ describe 'barbican::api' do
|
|||||||
[
|
[
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
:default_transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost',
|
|
||||||
:rpc_response_timeout => '120',
|
|
||||||
:control_exchange => 'barbican',
|
|
||||||
:notification_transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost',
|
|
||||||
:notification_driver => 'kombu',
|
|
||||||
:notification_topics => 'notifications',
|
|
||||||
:notification_retry => 10,
|
|
||||||
:rabbit_use_ssl => true,
|
|
||||||
:rabbit_heartbeat_timeout_threshold => '10',
|
|
||||||
:rabbit_heartbeat_rate => '10',
|
|
||||||
:rabbit_heartbeat_in_pthread => true,
|
|
||||||
:rabbit_qos_prefetch_count => 0,
|
|
||||||
:rabbit_ha_queues => true,
|
|
||||||
:rabbit_quorum_queue => true,
|
|
||||||
:rabbit_transient_quorum_queue => true,
|
|
||||||
:rabbit_quorum_delivery_limit => 3,
|
|
||||||
:rabbit_quorum_max_memory_length => 5,
|
|
||||||
:rabbit_quorum_max_memory_bytes => 1073741824,
|
|
||||||
:rabbit_enable_cancel_on_failover => false,
|
|
||||||
:amqp_durable_queues => true,
|
|
||||||
:enable_queue => true,
|
|
||||||
:queue_namespace => 'barbican1',
|
|
||||||
:queue_topic => 'barbican1.workers',
|
|
||||||
:queue_version => '1.2',
|
|
||||||
:queue_server_name => 'barbican1.queue',
|
|
||||||
:manage_service => true,
|
:manage_service => true,
|
||||||
:enabled => false,
|
:enabled => false,
|
||||||
:kombu_ssl_ca_certs => 'path_to_certs',
|
|
||||||
:kombu_ssl_certfile => 'path_to_certfile',
|
|
||||||
:kombu_ssl_keyfile => 'path_to_keyfile',
|
|
||||||
:kombu_ssl_version => '1.2',
|
|
||||||
:kombu_reconnect_delay => '10',
|
|
||||||
:kombu_failover_strategy => 'shuffle',
|
|
||||||
:kombu_compression => 'gzip',
|
|
||||||
:enabled_secretstore_plugins => ['dogtag_crypto', 'store_crypto', 'kmip'],
|
:enabled_secretstore_plugins => ['dogtag_crypto', 'store_crypto', 'kmip'],
|
||||||
:enabled_crypto_plugins => ['simple_crypto'],
|
:enabled_crypto_plugins => ['simple_crypto'],
|
||||||
:max_allowed_secret_in_bytes => 20000,
|
:max_allowed_secret_in_bytes => 20000,
|
||||||
@@ -154,50 +90,6 @@ describe 'barbican::api' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures queue' do
|
|
||||||
is_expected.to contain_barbican_config('queue/enable').with_value(param_hash[:enable_queue])
|
|
||||||
is_expected.to contain_barbican_config('queue/namespace').with_value(param_hash[:queue_namespace])
|
|
||||||
is_expected.to contain_barbican_config('queue/topic').with_value(param_hash[:queue_topic])
|
|
||||||
is_expected.to contain_barbican_config('queue/version').with_value(param_hash[:queue_version])
|
|
||||||
is_expected.to contain_barbican_config('queue/server_name').with_value(param_hash[:queue_server_name])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'configures rabbit' do
|
|
||||||
is_expected.to contain_oslo__messaging__default('barbican_config').with(
|
|
||||||
:transport_url => param_hash[:default_transport_url],
|
|
||||||
:rpc_response_timeout => param_hash[:rpc_response_timeout],
|
|
||||||
:control_exchange => param_hash[:control_exchange]
|
|
||||||
)
|
|
||||||
is_expected.to contain_oslo__messaging__notifications('barbican_config').with(
|
|
||||||
:transport_url => param_hash[:notification_transport_url],
|
|
||||||
:driver => param_hash[:notification_driver],
|
|
||||||
:topics => param_hash[:notification_topics],
|
|
||||||
:retry => param_hash[:notification_retry],
|
|
||||||
)
|
|
||||||
is_expected.to contain_oslo__messaging__rabbit('barbican_config').with(
|
|
||||||
:rabbit_use_ssl => param_hash[:rabbit_use_ssl],
|
|
||||||
:heartbeat_timeout_threshold => param_hash[:rabbit_heartbeat_timeout_threshold],
|
|
||||||
:heartbeat_rate => param_hash[:rabbit_heartbeat_rate],
|
|
||||||
:heartbeat_in_pthread => param_hash[:rabbit_heartbeat_in_pthread],
|
|
||||||
:rabbit_qos_prefetch_count => param_hash[:rabbit_qos_prefetch_count],
|
|
||||||
:kombu_reconnect_delay => param_hash[:kombu_reconnect_delay],
|
|
||||||
:kombu_failover_strategy => param_hash[:kombu_failover_strategy],
|
|
||||||
:amqp_durable_queues => param_hash[:amqp_durable_queues],
|
|
||||||
:kombu_compression => param_hash[:kombu_compression],
|
|
||||||
:kombu_ssl_ca_certs => param_hash[:kombu_ssl_ca_certs],
|
|
||||||
:kombu_ssl_certfile => param_hash[:kombu_ssl_certfile],
|
|
||||||
:kombu_ssl_keyfile => param_hash[:kombu_ssl_keyfile],
|
|
||||||
:kombu_ssl_version => param_hash[:kombu_ssl_version],
|
|
||||||
:rabbit_ha_queues => param_hash[:rabbit_ha_queues],
|
|
||||||
:rabbit_quorum_queue => param_hash[:rabbit_quorum_queue],
|
|
||||||
:rabbit_transient_quorum_queue => param_hash[:rabbit_transient_quorum_queue],
|
|
||||||
:rabbit_quorum_delivery_limit => param_hash[:rabbit_quorum_delivery_limit],
|
|
||||||
:rabbit_quorum_max_memory_length => param_hash[:rabbit_quorum_max_memory_length],
|
|
||||||
:rabbit_quorum_max_memory_bytes => param_hash[:rabbit_quorum_max_memory_bytes],
|
|
||||||
:enable_cancel_on_failover => param_hash[:rabbit_enable_cancel_on_failover],
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'configures enabled plugins' do
|
it 'configures enabled plugins' do
|
||||||
is_expected.to contain_barbican_config('secretstore/enabled_secretstore_plugins') \
|
is_expected.to contain_barbican_config('secretstore/enabled_secretstore_plugins') \
|
||||||
.with_value(param_hash[:enabled_secretstore_plugins])
|
.with_value(param_hash[:enabled_secretstore_plugins])
|
||||||
|
|||||||
@@ -24,14 +24,6 @@ describe 'barbican' do
|
|||||||
:purge => false
|
:purge => false
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
context 'with transport_url' do
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:default_transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost',
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'configures queue_options' do
|
it 'configures queue_options' do
|
||||||
is_expected.to contain_barbican_config('queue/enable').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_barbican_config('queue/enable').with_value('<SERVICE DEFAULT>')
|
||||||
@@ -43,7 +35,7 @@ describe 'barbican' do
|
|||||||
|
|
||||||
it 'configures rabbitmq parameters' do
|
it 'configures rabbitmq parameters' do
|
||||||
is_expected.to contain_oslo__messaging__default('barbican_config').with(
|
is_expected.to contain_oslo__messaging__default('barbican_config').with(
|
||||||
:transport_url => 'rabbit://bugs:bugs_bunny@localhost:1234/rabbithost',
|
:transport_url => '<SERVICE DEFAULT>',
|
||||||
:rpc_response_timeout => '<SERVICE DEFAULT>',
|
:rpc_response_timeout => '<SERVICE DEFAULT>',
|
||||||
:control_exchange => '<SERVICE DEFAULT>',
|
:control_exchange => '<SERVICE DEFAULT>',
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user