From eab9a69a6548b02e8b163ec8b452f3660c001edd Mon Sep 17 00:00:00 2001 From: Denis Egorenko Date: Wed, 21 Oct 2015 20:21:04 +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/stable/liberty/oslo_messaging/_drivers/amqp.py#L36 [2] http://docs.openstack.org/liberty/config-reference/content/configuring-rpc.html Change-Id: I7d701bcc12efe66ab67932f799ee09d57c942217 --- manifests/init.pp | 2 +- spec/classes/nova_init_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index cd6fcab15..eb2263f7c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -518,7 +518,7 @@ class nova( 'oslo_messaging_rabbit/heartbeat_timeout_threshold': value => $rabbit_heartbeat_timeout_threshold; 'oslo_messaging_rabbit/heartbeat_rate': value => $rabbit_heartbeat_rate; 'oslo_messaging_rabbit/kombu_reconnect_delay': value => $kombu_reconnect_delay; - 'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues; + 'oslo_messaging_rabbit/amqp_durable_queues': value => $amqp_durable_queues; } if $rabbit_use_ssl { diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index bd9aacd32..00ca77003 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -196,7 +196,7 @@ describe 'nova' do is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('1.0') - is_expected.to contain_nova_config('DEFAULT/amqp_durable_queues').with_value(false) + is_expected.to contain_nova_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false) is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') @@ -216,7 +216,7 @@ describe 'nova' do is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('1.0') - is_expected.to contain_nova_config('DEFAULT/amqp_durable_queues').with_value(false) + is_expected.to contain_nova_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false) end end @@ -263,7 +263,7 @@ describe 'nova' do is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_hosts').with_value('rabbit:5673') is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) is_expected.to contain_nova_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false) - is_expected.to contain_nova_config('DEFAULT/amqp_durable_queues').with_value(true) + is_expected.to contain_nova_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true) is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') is_expected.to contain_nova_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent')