From 8a3981a43ab8fe05a3ced713613984fb68053079 Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Wed, 21 Oct 2015 20:00:16 +0300 Subject: [PATCH] Change section name for AMQP rabbit parameters Parameter 'amqp_durable_queues' under section 'DEFAULT' now is deprecated since Liberty and should be placed under certain rpc backend section [1,2] [1] https://github.com/openstack/oslo.messaging/blob/liberty/oslo_messaging/_drivers/amqp.py#L36 [2] http://docs.openstack.org/liberty/config-reference/content/configuring-rpc.html Change-Id: I925470be2df1983ffce4eaf5df9c1f5c48705255 --- manifests/notify/rabbitmq.pp | 2 +- spec/classes/glance_notify_rabbitmq_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/notify/rabbitmq.pp b/manifests/notify/rabbitmq.pp index 87110e83..6a822660 100644 --- a/manifests/notify/rabbitmq.pp +++ b/manifests/notify/rabbitmq.pp @@ -126,7 +126,7 @@ class glance::notify::rabbitmq( 'oslo_messaging_rabbit/heartbeat_timeout_threshold': value => $rabbit_heartbeat_timeout_threshold; 'oslo_messaging_rabbit/heartbeat_rate': value => $rabbit_heartbeat_rate; 'oslo_messaging_rabbit/rabbit_use_ssl': value => $rabbit_use_ssl; - 'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues_real; + 'oslo_messaging_rabbit/amqp_durable_queues': value => $amqp_durable_queues_real; } if $rabbit_use_ssl { diff --git a/spec/classes/glance_notify_rabbitmq_spec.rb b/spec/classes/glance_notify_rabbitmq_spec.rb index ad84e284..a3aa4422 100644 --- a/spec/classes/glance_notify_rabbitmq_spec.rb +++ b/spec/classes/glance_notify_rabbitmq_spec.rb @@ -22,7 +22,7 @@ describe 'glance::notify::rabbitmq' do it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_port').with_value('5672') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_hosts').with_value('localhost:5672') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('false') } - it { is_expected.to contain_glance_api_config('DEFAULT/amqp_durable_queues').with_value('false') } + it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('false') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_virtual_host').with_value('/') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_notification_exchange').with_value('glance') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_notification_topic').with_value('notifications') } @@ -105,7 +105,7 @@ describe 'glance::notify::rabbitmq' do it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_port').with_value('5673') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_hosts').with_value('localhost2:5673') } it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') } - it { is_expected.to contain_glance_api_config('DEFAULT/amqp_durable_queues').with_value('true') } + it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('true') } end describe 'when passing params for multiple rabbit hosts' do @@ -143,6 +143,6 @@ describe 'glance::notify::rabbitmq' do :rabbit_password => 'pass' } end - it { is_expected.to contain_glance_api_config('DEFAULT/amqp_durable_queues').with_value('true') } + it { is_expected.to contain_glance_api_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('true') } end end