From 8d8d68567f8db1dcceeee7a013067040f0f05a88 Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Wed, 4 May 2016 12:58:25 -0400 Subject: [PATCH] Introduce support for oslo.messaging amqp driver configuration This commit adds support for the oslo.messaging amqp rpc_backend which enables the AMQP 1.0 driver. A proposed feature for the Newton oslo.messaging release is an update to the AMQP 1.0 driver to support a stateless messaging interconnect for RPC traffic [1]. This patch: * use oslo::messaging::amqp resource * add new parameters for the oslo_messaging_amqp driver * update spec tests for amqp as alternate rpc_backend * add feature release note [1] https://blueprints.launchpad.net/oslo.messaging/+spec/amqp-dispatch-router Change-Id: Ica192f3b5da5f02745e25b6a6b7c344dcaf7cc99 --- manifests/init.pp | 101 ++++++++++++++++++ ..._oslo_messaging_amqp-371ec0eff31b5749.yaml | 3 + spec/classes/aodh_init_spec.rb | 53 +++++++++ 3 files changed, 157 insertions(+) create mode 100644 releasenotes/notes/add_oslo_messaging_amqp-371ec0eff31b5749.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 4b89ab30..2d642b8b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,6 +15,7 @@ # # [*rpc_backend*] # (optional) The rpc backend implementation to use, can be: +# amqp (for AMQP 1.0 protocol) # rabbit (for rabbitmq) # zmq (for zeromq) # Defaults to 'rabbit' @@ -99,6 +100,70 @@ # (optional) Define queues as "durable" to rabbitmq. # Defaults to $::os_service_default # +# [*amqp_server_request_prefix*] +# (Optional) Address prefix used when sending to a specific server +# Defaults to $::os_service_default. +# +# [*amqp_broadcast_prefix*] +# (Optional) address prefix used when broadcasting to all servers +# Defaults to $::os_service_default. +# +# [*amqp_group_request_prefix*] +# (Optional) address prefix when sending to any server in group +# Defaults to $::os_service_default. +# +# [*amqp_container_name*] +# (Optional) Name for the AMQP container +# Defaults to $::os_service_default. +# +# [*amqp_idle_timeout*] +# (Optional) Timeout for inactive connections +# Defaults to $::os_service_default. +# +# [*amqp_trace*] +# (Optional) Debug: dump AMQP frames to stdout +# Defaults to $::os_service_default. +# +# [*amqp_ssl_ca_file*] +# (Optional) CA certificate PEM file to verify server certificate +# Defaults to $::os_service_default. +# +# [*amqp_ssl_cert_file*] +# (Optional) Identifying certificate PEM file to present to clients +# Defaults to $::os_service_default. +# +# [*amqp_ssl_key_file*] +# (Optional) Private key PEM file used to sign cert_file certificate +# Defaults to $::os_service_default. +# +# [*amqp_ssl_key_password*] +# (Optional) Password for decrypting ssl_key_file (if encrypted) +# Defaults to $::os_service_default. +# +# [*amqp_allow_insecure_clients*] +# (Optional) Accept clients using either SSL or plain TCP +# Defaults to $::os_service_default. +# +# [*amqp_sasl_mechanisms*] +# (Optional) Space separated list of acceptable SASL mechanisms +# Defaults to $::os_service_default. +# +# [*amqp_sasl_config_dir*] +# (Optional) Path to directory that contains the SASL configuration +# Defaults to $::os_service_default. +# +# [*amqp_sasl_config_name*] +# (Optional) Name of configuration file (without .conf suffix) +# Defaults to $::os_service_default. +# +# [*amqp_username*] +# (Optional) User name for message broker authentication +# Defaults to $::os_service_default. +# +# [*amqp_password*] +# (Optional) Password for message broker authentication +# Defaults to $::os_service_default. +# # [*log_dir*] # (optional) Directory where logs should be stored. # If set to boolean false or the $::os_service_default, it will not log to @@ -193,6 +258,22 @@ class aodh ( $kombu_reconnect_delay = $::os_service_default, $kombu_compression = $::os_service_default, $amqp_durable_queues = $::os_service_default, + $amqp_server_request_prefix = $::os_service_default, + $amqp_broadcast_prefix = $::os_service_default, + $amqp_group_request_prefix = $::os_service_default, + $amqp_container_name = $::os_service_default, + $amqp_idle_timeout = $::os_service_default, + $amqp_trace = $::os_service_default, + $amqp_ssl_ca_file = $::os_service_default, + $amqp_ssl_cert_file = $::os_service_default, + $amqp_ssl_key_file = $::os_service_default, + $amqp_ssl_key_password = $::os_service_default, + $amqp_allow_insecure_clients = $::os_service_default, + $amqp_sasl_mechanisms = $::os_service_default, + $amqp_sasl_config_dir = $::os_service_default, + $amqp_sasl_config_name = $::os_service_default, + $amqp_username = $::os_service_default, + $amqp_password = $::os_service_default, $verbose = undef, $debug = undef, $use_syslog = undef, @@ -243,6 +324,26 @@ class aodh ( amqp_durable_queues => $amqp_durable_queues, } } + elsif $rpc_backend == 'amqp' { + oslo::messaging::amqp { 'aodh_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, + allow_insecure_clients => $amqp_allow_insecure_clients, + 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::notifications { 'aodh_config': driver => $notification_driver, diff --git a/releasenotes/notes/add_oslo_messaging_amqp-371ec0eff31b5749.yaml b/releasenotes/notes/add_oslo_messaging_amqp-371ec0eff31b5749.yaml new file mode 100644 index 00000000..6e75e37f --- /dev/null +++ b/releasenotes/notes/add_oslo_messaging_amqp-371ec0eff31b5749.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add support for oslo_messaging_amqp backend via puppet-oslo resource \ No newline at end of file diff --git a/spec/classes/aodh_init_spec.rb b/spec/classes/aodh_init_spec.rb index aad78db9..843c8e7d 100644 --- a/spec/classes/aodh_init_spec.rb +++ b/spec/classes/aodh_init_spec.rb @@ -193,6 +193,59 @@ describe 'aodh' do is_expected.to contain_aodh_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') end end + + context 'with amqp rpc_backend' do + let :params do + { :rpc_backend => 'amqp' } + end + + context 'with default parameters' do + it 'configures amqp' do + is_expected.to contain_aodh_config('DEFAULT/rpc_backend').with_value('amqp') + is_expected.to contain_aodh_config('oslo_messaging_amqp/server_request_prefix').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/broadcast_prefix').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/group_request_prefix').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/container_name').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/idle_timeout').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/trace').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/ssl_ca_file').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/ssl_cert_file').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/ssl_key_file').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/ssl_key_password').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/allow_insecure_clients').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/sasl_config_dir').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/sasl_config_name').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/username').with_value('') + is_expected.to contain_aodh_config('oslo_messaging_amqp/password').with_value('') + end + end + end + + context 'with overriden amqp parameters' do + let :params do + { :rpc_backend => 'amqp', + :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_aodh_config('DEFAULT/rpc_backend').with_value('amqp') + is_expected.to contain_aodh_config('oslo_messaging_amqp/idle_timeout').with_value('60') + is_expected.to contain_aodh_config('oslo_messaging_amqp/trace').with_value('true') + is_expected.to contain_aodh_config('oslo_messaging_amqp/ssl_ca_file').with_value('/etc/ca.cert') + is_expected.to contain_aodh_config('oslo_messaging_amqp/ssl_cert_file').with_value('/etc/certfile') + is_expected.to contain_aodh_config('oslo_messaging_amqp/ssl_key_file').with_value('/etc/key') + is_expected.to contain_aodh_config('oslo_messaging_amqp/username').with_value('amqp_user') + is_expected.to contain_aodh_config('oslo_messaging_amqp/password').with_value('password') + end + end end on_supported_os({