From af76d786f6ed87ce17b768b5f7d47e9bfa7eb4a4 Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Tue, 14 Apr 2015 22:07:54 +0200 Subject: [PATCH] Move rabbit/kombu settings to oslo_messaging_rabbit section Kilo oslo-messaging deprecates rabbit/kombu settings in the DEFAULT section. Move these settings to proper oslo_messaging_rabbit section. Change-Id: I9e5413e7165d7417e89e1dc684657d2c45517817 Closes-bug: 1444161 Signed-off-by: Gael Chamoulaud --- manifests/init.pp | 46 +++++++++++++-------------- spec/classes/ironic_init_spec.rb | 54 ++++++++++++++++---------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index bd48bc22..749a6a87 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -325,52 +325,52 @@ class ironic ( } ironic_config { - 'DEFAULT/rabbit_userid': value => $rabbit_user_real; - 'DEFAULT/rabbit_password': value => $rabbit_password, secret => true; - 'DEFAULT/rabbit_virtual_host': value => $rabbit_virtual_host; - 'DEFAULT/rabbit_use_ssl': value => $rabbit_use_ssl; + 'oslo_messaging_rabbit/rabbit_userid': value => $rabbit_user_real; + 'oslo_messaging_rabbit/rabbit_password': value => $rabbit_password, secret => true; + 'oslo_messaging_rabbit/rabbit_virtual_host': value => $rabbit_virtual_host; + 'oslo_messaging_rabbit/rabbit_use_ssl': value => $rabbit_use_ssl; 'DEFAULT/control_exchange': value => $control_exchange; 'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues; } if $rabbit_hosts { - ironic_config { 'DEFAULT/rabbit_hosts': value => join($rabbit_hosts, ',') } - ironic_config { 'DEFAULT/rabbit_ha_queues': value => true } - ironic_config { 'DEFAULT/rabbit_host': ensure => absent } - ironic_config { 'DEFAULT/rabbit_port': ensure => absent } + ironic_config { 'oslo_messaging_rabbit/rabbit_hosts': value => join($rabbit_hosts, ',') } + ironic_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => true } + ironic_config { 'oslo_messaging_rabbit/rabbit_host': ensure => absent } + ironic_config { 'oslo_messaging_rabbit/rabbit_port': ensure => absent } } else { - ironic_config { 'DEFAULT/rabbit_host': value => $rabbit_host } - ironic_config { 'DEFAULT/rabbit_port': value => $rabbit_port } - ironic_config { 'DEFAULT/rabbit_hosts': value => "${rabbit_host}:${rabbit_port}" } - ironic_config { 'DEFAULT/rabbit_ha_queues': value => false } + ironic_config { 'oslo_messaging_rabbit/rabbit_host': value => $rabbit_host } + ironic_config { 'oslo_messaging_rabbit/rabbit_port': value => $rabbit_port } + ironic_config { 'oslo_messaging_rabbit/rabbit_hosts': value => "${rabbit_host}:${rabbit_port}" } + ironic_config { 'oslo_messaging_rabbit/rabbit_ha_queues': value => false } } if $rabbit_use_ssl { - ironic_config { 'DEFAULT/kombu_ssl_version': value => $kombu_ssl_version } + ironic_config { 'oslo_messaging_rabbit/kombu_ssl_version': value => $kombu_ssl_version } if $kombu_ssl_ca_certs { - ironic_config { 'DEFAULT/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs } + ironic_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': value => $kombu_ssl_ca_certs } } else { - ironic_config { 'DEFAULT/kombu_ssl_ca_certs': ensure => absent} + ironic_config { 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent} } if $kombu_ssl_certfile { - ironic_config { 'DEFAULT/kombu_ssl_certfile': value => $kombu_ssl_certfile } + ironic_config { 'oslo_messaging_rabbit/kombu_ssl_certfile': value => $kombu_ssl_certfile } } else { - ironic_config { 'DEFAULT/kombu_ssl_certfile': ensure => absent} + ironic_config { 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent} } if $kombu_ssl_keyfile { - ironic_config { 'DEFAULT/kombu_ssl_keyfile': value => $kombu_ssl_keyfile } + ironic_config { 'oslo_messaging_rabbit/kombu_ssl_keyfile': value => $kombu_ssl_keyfile } } else { - ironic_config { 'DEFAULT/kombu_ssl_keyfile': ensure => absent} + ironic_config { 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent} } } else { ironic_config { - 'DEFAULT/kombu_ssl_ca_certs': ensure => absent; - 'DEFAULT/kombu_ssl_certfile': ensure => absent; - 'DEFAULT/kombu_ssl_keyfile': ensure => absent; - 'DEFAULT/kombu_ssl_version': ensure => absent; + 'oslo_messaging_rabbit/kombu_ssl_ca_certs': ensure => absent; + 'oslo_messaging_rabbit/kombu_ssl_certfile': ensure => absent; + 'oslo_messaging_rabbit/kombu_ssl_keyfile': ensure => absent; + 'oslo_messaging_rabbit/kombu_ssl_version': ensure => absent; } } } diff --git a/spec/classes/ironic_init_spec.rb b/spec/classes/ironic_init_spec.rb index fb3f0ca8..1f5a037a 100644 --- a/spec/classes/ironic_init_spec.rb +++ b/spec/classes/ironic_init_spec.rb @@ -128,10 +128,10 @@ describe 'ironic' do end it 'configures credentials for rabbit' do - is_expected.to contain_ironic_config('DEFAULT/rabbit_userid').with_value( params[:rabbit_userid] ) - is_expected.to contain_ironic_config('DEFAULT/rabbit_password').with_value( params[:rabbit_password] ) - is_expected.to contain_ironic_config('DEFAULT/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] ) - is_expected.to contain_ironic_config('DEFAULT/rabbit_password').with_secret( true ) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_userid').with_value( params[:rabbit_userid] ) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_password').with_value( params[:rabbit_password] ) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_virtual_host').with_value( params[:rabbit_virtual_host] ) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_password').with_secret( true ) end it 'should perform default database configuration' do @@ -155,19 +155,19 @@ describe 'ironic' do shared_examples_for 'rabbit HA with a single virtual host' do it 'in ironic.conf' do - is_expected.to contain_ironic_config('DEFAULT/rabbit_host').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/rabbit_port').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts] ) - is_expected.to contain_ironic_config('DEFAULT/rabbit_ha_queues').with_value(true) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_host').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_port').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts] ) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) end end shared_examples_for 'rabbit HA with multiple hosts' do it 'in ironic.conf' do - is_expected.to contain_ironic_config('DEFAULT/rabbit_host').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/rabbit_port').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') ) - is_expected.to contain_ironic_config('DEFAULT/rabbit_ha_queues').with_value(true) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_host').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_port').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') ) + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) end end @@ -183,11 +183,11 @@ describe 'ironic' do end it do - is_expected.to contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('true') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_version').with_value('TLSv1') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_value('/path/to/ssl/ca/certs') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_value('/path/to/ssl/cert/file') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_value('/path/to/ssl/keyfile') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') end end @@ -199,11 +199,11 @@ describe 'ironic' do end it do - is_expected.to contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('true') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_version').with_value('TLSv1') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('true') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_version').with_value('TLSv1') end end @@ -219,11 +219,11 @@ describe 'ironic' do end it do - is_expected.to contain_ironic_config('DEFAULT/rabbit_use_ssl').with_value('false') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_ca_certs').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_certfile').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_keyfile').with_ensure('absent') - is_expected.to contain_ironic_config('DEFAULT/kombu_ssl_version').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value('false') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_ca_certs').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_certfile').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_keyfile').with_ensure('absent') + is_expected.to contain_ironic_config('oslo_messaging_rabbit/kombu_ssl_version').with_ensure('absent') end end