From 050c202eb818e6570eb7103cd4e086150498cab5 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Fri, 10 Mar 2017 10:05:30 +0200 Subject: [PATCH] rabbitmq/messaging: Use new standard TLS params The parameters for drivers in oslo.messaging are being standardized [1]. And part of this is also the sandarization of the TLS-related parameters. As per a recent commit [2], the rabbitmq configuration parameters have changed and the old names are being deprecated (although they still work). This patch reflects that. [1] https://etherpad.openstack.org/p/common_driver_config [2] Ic32b2cb253fa0dc43aad7226b24919b7e588faa9 Change-Id: I8d41ec4e1a7bca3d114286a034f663c2a2c9b8d7 Depends-On: Iac788319caac7bb20b24ee1696d13b9ab15ca1c4 Depends-On: I7d69466479cc689d251665ff4a9affcd6503379a Depends-On: I7d24d4bd2b77ef3dff8bb8ad703938399681573a Depends-On: Ic078c7f036ce93fc91bd496884e4423b9653b1c8 Depends-On: I3472959e0be1e817caaecd36cf4c6c54485c6063 Depends-On: Ibb82146271482f6ae2db03e0e541cce8abe59409 Depends-On: I17b78a8f96b83bf647321d7096322d6e16a483c9 Depends-On: I60cc9bbe655d8dc7d08dd7a0d6466c7774b8f5a8 Depends-On: I3d56406f122299f16269cd910339ad09092bd3ab Depends-On: Ibc69ae286d723ebecf8a86c247cf807ccf0604b4 Depends-On: I9296155ee865b35f67978fe1fc002a7feb5ab454 Depends-On: I2f0a392e4b0a7a7ab61cc1e853fca44c3b9cbe97 Depends-On: Iaa1aa2b14aa978d56a54695ddb8bbd0238ba1882 Depends-On: I26dae32b3093d25544542243697273238a18b078 --- manifests/messaging/rabbit.pp | 10 +++++----- spec/defines/oslo_messaging_rabbit_spec.rb | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manifests/messaging/rabbit.pp b/manifests/messaging/rabbit.pp index 4cd629f..9169ecf 100644 --- a/manifests/messaging/rabbit.pp +++ b/manifests/messaging/rabbit.pp @@ -215,17 +215,17 @@ rabbit_password, rabbit_virtual_host parameters have been deprecated by the \ 'oslo_messaging_rabbit/rabbit_retry_backoff' => { value => $rabbit_retry_backoff }, 'oslo_messaging_rabbit/rabbit_retry_interval' => { value => $rabbit_retry_interval }, 'oslo_messaging_rabbit/rabbit_transient_queues_ttl' => { value => $rabbit_transient_queues_ttl }, - 'oslo_messaging_rabbit/rabbit_use_ssl' => { value => $rabbit_use_ssl }, + 'oslo_messaging_rabbit/ssl' => { value => $rabbit_use_ssl }, 'oslo_messaging_rabbit/rabbit_userid' => { value => $rabbit_userid }, 'oslo_messaging_rabbit/rabbit_virtual_host' => { value => $rabbit_virtual_host }, 'oslo_messaging_rabbit/rabbit_hosts' => { value => $rabbit_hosts_orig }, 'oslo_messaging_rabbit/rabbit_port' => { value => $rabbit_port_orig }, 'oslo_messaging_rabbit/rabbit_host' => { value => $rabbit_host_orig }, 'oslo_messaging_rabbit/rabbit_ha_queues' => { value => $rabbit_ha_queues_orig }, - 'oslo_messaging_rabbit/kombu_ssl_ca_certs' => { value => $kombu_ssl_ca_certs }, - 'oslo_messaging_rabbit/kombu_ssl_certfile' => { value => $kombu_ssl_certfile }, - 'oslo_messaging_rabbit/kombu_ssl_keyfile' => { value => $kombu_ssl_keyfile }, - 'oslo_messaging_rabbit/kombu_ssl_version' => { value => $kombu_ssl_version }, + 'oslo_messaging_rabbit/ssl_ca_file' => { value => $kombu_ssl_ca_certs }, + 'oslo_messaging_rabbit/ssl_cert_file' => { value => $kombu_ssl_certfile }, + 'oslo_messaging_rabbit/ssl_key_file' => { value => $kombu_ssl_keyfile }, + 'oslo_messaging_rabbit/ssl_version' => { value => $kombu_ssl_version }, 'DEFAULT/rpc_backend' => { value => 'rabbit' }, } diff --git a/spec/defines/oslo_messaging_rabbit_spec.rb b/spec/defines/oslo_messaging_rabbit_spec.rb index 58cad52..9bedc73 100644 --- a/spec/defines/oslo_messaging_rabbit_spec.rb +++ b/spec/defines/oslo_messaging_rabbit_spec.rb @@ -16,7 +16,7 @@ describe 'oslo::messaging::rabbit' do is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_host').with_value('') is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_port').with_value('') is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_hosts').with_value('') - is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl').with_value('') is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_userid').with_value('') is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_password').with_value('') is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_login_method').with_value('') @@ -107,11 +107,11 @@ describe 'oslo::messaging::rabbit' do end it 'configures rabbit' do - is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true) - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/etc/ca.cert') - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/etc/certfile') - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/etc/key') - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl').with_value(true) + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_ca_file').with_value('/etc/ca.cert') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_cert_file').with_value('/etc/certfile') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_key_file').with_value('/etc/key') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_version').with_value('TLSv1') end end @@ -121,11 +121,11 @@ describe 'oslo::messaging::rabbit' do end it 'configures rabbit' do - is_expected.to contain_keystone_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(true) - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('') - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('') - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('') - is_expected.to contain_keystone_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl').with_value(true) + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_ca_file').with_value('') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_cert_file').with_value('') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_key_file').with_value('') + is_expected.to contain_keystone_config('oslo_messaging_rabbit/ssl_version').with_value('') end end