Merge "Remove support for amqp1 messaging driver"
This commit is contained in:
Zuul
Gerrit Code Review
commit
56878cd0d2
|
|
@ -98,66 +98,6 @@
|
|||
# (Optional) Use durable queues in amqp.
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_server_request_prefix*]
|
||||
# (Optional) Address prefix used when sending to a specific server
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_broadcast_prefix*]
|
||||
# (Optional) address prefix used when broadcasting to all servers
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_group_request_prefix*]
|
||||
# (Optional) address prefix when sending to any server in group
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_container_name*]
|
||||
# (Optional) Name for the AMQP container
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_idle_timeout*]
|
||||
# (Optional) Timeout for inactive connections
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_trace*]
|
||||
# (Optional) Debug: dump AMQP frames to stdout
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_ssl_ca_file*]
|
||||
# (Optional) CA certificate PEM file to verify server certificate
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_ssl_cert_file*]
|
||||
# (Optional) Identifying certificate PEM file to present to clients
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_ssl_key_file*]
|
||||
# (Optional) Private key PEM file used to sign cert_file certificate
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_ssl_key_password*]
|
||||
# (Optional) Password for decrypting ssl_key_file (if encrypted)
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_sasl_mechanisms*]
|
||||
# (Optional) Space separated list of acceptable SASL mechanisms
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_sasl_config_dir*]
|
||||
# (Optional) Path to directory that contains the SASL configuration
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_sasl_config_name*]
|
||||
# (Optional) Name of configuration file (without .conf suffix)
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_username*]
|
||||
# (Optional) User name for message broker authentication
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*amqp_password*]
|
||||
# (Optional) Password for message broker authentication
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*default_transport_url*]
|
||||
# (optional) A URL representing the messaging driver to use for notifications
|
||||
# and its full configuration. Transport URLs take the form:
|
||||
|
|
@ -261,21 +201,6 @@ class cloudkitty(
|
|||
$kombu_failover_strategy = $facts['os_service_default'],
|
||||
$kombu_compression = $facts['os_service_default'],
|
||||
$amqp_durable_queues = $facts['os_service_default'],
|
||||
$amqp_server_request_prefix = $facts['os_service_default'],
|
||||
$amqp_broadcast_prefix = $facts['os_service_default'],
|
||||
$amqp_group_request_prefix = $facts['os_service_default'],
|
||||
$amqp_container_name = $facts['os_service_default'],
|
||||
$amqp_idle_timeout = $facts['os_service_default'],
|
||||
$amqp_trace = $facts['os_service_default'],
|
||||
$amqp_ssl_ca_file = $facts['os_service_default'],
|
||||
$amqp_ssl_cert_file = $facts['os_service_default'],
|
||||
$amqp_ssl_key_file = $facts['os_service_default'],
|
||||
$amqp_ssl_key_password = $facts['os_service_default'],
|
||||
$amqp_sasl_mechanisms = $facts['os_service_default'],
|
||||
$amqp_sasl_config_dir = $facts['os_service_default'],
|
||||
$amqp_sasl_config_name = $facts['os_service_default'],
|
||||
$amqp_username = $facts['os_service_default'],
|
||||
$amqp_password = $facts['os_service_default'],
|
||||
$notification_driver = $facts['os_service_default'],
|
||||
$notification_topics = $facts['os_service_default'],
|
||||
$default_transport_url = $facts['os_service_default'],
|
||||
|
|
@ -332,24 +257,6 @@ class cloudkitty(
|
|||
rabbit_quorum_max_memory_bytes => $rabbit_quorum_max_memory_bytes,
|
||||
}
|
||||
|
||||
oslo::messaging::amqp { 'cloudkitty_config':
|
||||
server_request_prefix => $amqp_server_request_prefix,
|
||||
broadcast_prefix => $amqp_broadcast_prefix,
|
||||
group_request_prefix => $amqp_group_request_prefix,
|
||||
container_name => $amqp_container_name,
|
||||
idle_timeout => $amqp_idle_timeout,
|
||||
trace => $amqp_trace,
|
||||
ssl_ca_file => $amqp_ssl_ca_file,
|
||||
ssl_cert_file => $amqp_ssl_cert_file,
|
||||
ssl_key_file => $amqp_ssl_key_file,
|
||||
ssl_key_password => $amqp_ssl_key_password,
|
||||
sasl_mechanisms => $amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $amqp_sasl_config_dir,
|
||||
sasl_config_name => $amqp_sasl_config_name,
|
||||
username => $amqp_username,
|
||||
password => $amqp_password,
|
||||
}
|
||||
|
||||
oslo::messaging::default { 'cloudkitty_config':
|
||||
transport_url => $default_transport_url,
|
||||
rpc_response_timeout => $rpc_response_timeout,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
Support for amqp1 messaging driver has been removed.
|
||||
|
|
@ -54,25 +54,6 @@ describe 'cloudkitty' do
|
|||
)
|
||||
end
|
||||
|
||||
it 'configures amqp' do
|
||||
is_expected.to contain_oslo__messaging__amqp('cloudkitty_config').with(
|
||||
:server_request_prefix => '<SERVICE DEFAULT>',
|
||||
:broadcast_prefix => '<SERVICE DEFAULT>',
|
||||
:group_request_prefix => '<SERVICE DEFAULT>',
|
||||
:container_name => '<SERVICE DEFAULT>',
|
||||
:idle_timeout => '<SERVICE DEFAULT>',
|
||||
:trace => '<SERVICE DEFAULT>',
|
||||
:ssl_ca_file => '<SERVICE DEFAULT>',
|
||||
:ssl_cert_file => '<SERVICE DEFAULT>',
|
||||
:ssl_key_file => '<SERVICE DEFAULT>',
|
||||
:sasl_mechanisms => '<SERVICE DEFAULT>',
|
||||
:sasl_config_dir => '<SERVICE DEFAULT>',
|
||||
:sasl_config_name => '<SERVICE DEFAULT>',
|
||||
:username => '<SERVICE DEFAULT>',
|
||||
:password => '<SERVICE DEFAULT>',
|
||||
)
|
||||
end
|
||||
|
||||
it 'configures storage' do
|
||||
is_expected.to contain_cloudkitty_config('storage/backend').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cloudkitty_config('storage/version').with_value('<SERVICE DEFAULT>')
|
||||
|
|
@ -180,35 +161,6 @@ describe 'cloudkitty' do
|
|||
end
|
||||
end
|
||||
|
||||
context 'with overridden amqp parameters' do
|
||||
let :params do
|
||||
{ :amqp_idle_timeout => '60',
|
||||
:amqp_trace => true,
|
||||
:amqp_ssl_ca_file => '/etc/ca.cert',
|
||||
:amqp_ssl_cert_file => '/etc/certfile',
|
||||
:amqp_ssl_key_file => '/etc/key',
|
||||
:amqp_username => 'amqp_user',
|
||||
:amqp_password => 'password',
|
||||
}
|
||||
end
|
||||
|
||||
it 'configures amqp' do
|
||||
is_expected.to contain_oslo__messaging__amqp('cloudkitty_config').with(
|
||||
:server_request_prefix => '<SERVICE DEFAULT>',
|
||||
:broadcast_prefix => '<SERVICE DEFAULT>',
|
||||
:group_request_prefix => '<SERVICE DEFAULT>',
|
||||
:container_name => '<SERVICE DEFAULT>',
|
||||
:idle_timeout => 60,
|
||||
:trace => true,
|
||||
:ssl_ca_file => '/etc/ca.cert',
|
||||
:ssl_cert_file => '/etc/certfile',
|
||||
:ssl_key_file => '/etc/key',
|
||||
:username => 'amqp_user',
|
||||
:password => 'password',
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
context 'with metrics_config' do
|
||||
let :params do
|
||||
{ :metrics_config => {'metrics' => {}},
|
||||
|
|
|
|||
Loading…
Reference in New Issue