diff --git a/manifests/init.pp b/manifests/init.pp index a49921b1a..8d419e2a7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -510,7 +510,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 267babbe4..73c7eaa09 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')