diff --git a/manifests/init.pp b/manifests/init.pp index 504c8db1..faac1b34 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -110,6 +110,70 @@ # Use durable queues in amqp. # (Optional) Defaults to false. # +# [*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. +# # [*use_syslog*] # (Optional) Use syslog for logging. # Defaults to undef. @@ -250,6 +314,22 @@ class cinder ( $kombu_ssl_version = $::os_service_default, $kombu_reconnect_delay = $::os_service_default, $amqp_durable_queues = false, + $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, $package_ensure = 'present', $use_ssl = false, $ca_file = $::os_service_default, @@ -335,6 +415,36 @@ class cinder ( 'DEFAULT/service_down_time': value => $service_down_time; } } + elsif $rpc_backend == 'amqp' { + + oslo::messaging::amqp { 'cinder_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::default { 'cinder_config': + control_exchange => $control_exchange + } + + cinder_config { + 'DEFAULT/report_interval': value => $report_interval; + 'DEFAULT/service_down_time': value => $service_down_time; + } + } if ! $default_availability_zone { $default_availability_zone_real = $storage_availability_zone diff --git a/releasenotes/notes/add_oslo_messaging_amqp-d4c4c266e1a904ae.yaml b/releasenotes/notes/add_oslo_messaging_amqp-d4c4c266e1a904ae.yaml new file mode 100644 index 00000000..4c0b5fdc --- /dev/null +++ b/releasenotes/notes/add_oslo_messaging_amqp-d4c4c266e1a904ae.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add support for oslo_messaging_amqp backend via puppet-oslo resource diff --git a/spec/classes/cinder_spec.rb b/spec/classes/cinder_spec.rb index a69c4424..a2d666d9 100644 --- a/spec/classes/cinder_spec.rb +++ b/spec/classes/cinder_spec.rb @@ -179,6 +179,66 @@ describe 'cinder' do it { is_expected.to contain_cinder_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true) } end + describe 'with amqp rpc_backend defaults' do + let :params do + { :rpc_backend => 'amqp' } + end + + it 'configures amqp' do + is_expected.to contain_cinder_config('DEFAULT/rpc_backend').with_value('amqp') + is_expected.to contain_cinder_config('oslo_messaging_amqp/server_request_prefix').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/broadcast_prefix').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/group_request_prefix').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/container_name').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/idle_timeout').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/trace').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/ssl_ca_file').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/ssl_cert_file').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/ssl_key_file').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/ssl_key_password').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/allow_insecure_clients').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/sasl_config_dir').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/sasl_config_name').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/username').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/password').with_value('') + end + end + + describe 'with amqp rpc_backend overrides' do + let :params do + { + :rpc_backend => 'amqp', + :amqp_idle_timeout => '60', + :amqp_trace => true, + :amqp_ssl_ca_file => '/path/to/ca.cert', + :amqp_ssl_cert_file => '/path/to/certfile', + :amqp_ssl_key_file => '/path/to/key', + :amqp_username => 'amqp_user', + :amqp_password => 'password', + } + end + + it do + is_expected.to contain_cinder_config('DEFAULT/rpc_backend').with_value('amqp') + is_expected.to contain_cinder_config('oslo_messaging_amqp/server_request_prefix').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/broadcast_prefix').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/group_request_prefix').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/container_name').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/idle_timeout').with_value('60') + is_expected.to contain_cinder_config('oslo_messaging_amqp/trace').with_value('true') + is_expected.to contain_cinder_config('oslo_messaging_amqp/ssl_ca_file').with_value('/path/to/ca.cert') + is_expected.to contain_cinder_config('oslo_messaging_amqp/ssl_cert_file').with_value('/path/to/certfile') + is_expected.to contain_cinder_config('oslo_messaging_amqp/ssl_key_file').with_value('/path/to/key') + is_expected.to contain_cinder_config('oslo_messaging_amqp/allow_insecure_clients').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/sasl_config_dir').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/sasl_config_name').with_value('') + is_expected.to contain_cinder_config('oslo_messaging_amqp/username').with_value('amqp_user') + is_expected.to contain_cinder_config('oslo_messaging_amqp/password').with_value('password') + end + end + describe 'with postgresql' do let :params do {