From 0811f05d12bdba1a5a39f1e62bf508f84b6fb0b3 Mon Sep 17 00:00:00 2001 From: Xiaohua Yuan Date: Tue, 7 Jul 2015 19:12:47 -0700 Subject: [PATCH] Move qpid settings to oslo_messaging_qpid section Kilo oslo-messaging deprecates qpid settings in the DEFAULT section. Move these settings to proper oslo_messaging_qpid section. Change-Id: I342f8e503884662139db8b8d245d14a88ca5fa96 Closes-Bug: #1472039 --- manifests/init.pp | 65 +++++++++++++++++++++++++++---------- spec/classes/manila_spec.rb | 32 +++++++++--------- 2 files changed, 64 insertions(+), 33 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index c25715fb..b516bc45 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -85,30 +85,61 @@ # ==== Various QPID options (Optional) # # [*qpid_hostname*] +# (Optional) hostname of the qpid server. +# Defaults to 'localhost' # # [*qpid_port*] +# (Optional) Port of the qpid server. +# Defaults to 5672. # # [*qpid_username*] +# (Optional) User to connect to the qpid server. +# Defaults to 'guest' # # [*qpid_password*] +# (Optional) Password to connect to the qpid_server. +# Defaults to empty. # # [*qpid_heartbeat*] +# (Optional) Seconds between connection keepalive heartbeats. +# Defaults to 60s. # # [*qpid_protocol*] +# (Optional) Transport to use, either 'tcp' or 'ssl'. +# Defaults to tcp. # # [*qpid_tcp_nodelay*] +# (Optional) Whether to disable the Nagle algorithm. +# Defaults to true. # # [*qpid_reconnect*] +# (Optional) Enable the experimental use of reconnect on connection +# lost. +# Defaults to true. # # [*qpid_reconnect_timeout*] +# (Optional) How long to wait before considering a reconnect attempt +# to have failed. This value should not be longer than rpc_response_timeout. +# Defaults to 0. # # [*qpid_reconnect_limit*] +# (Optional) Limit of reconnect on connection lost. +# Defaults to 0. # # [*qpid_reconnect_interval*] +# (Optional) Interval between retries of opening a qpid connection. (integer +# value) +# Defaults to 0. # # [*qpid_reconnect_interval_min*] +# (Optional) Minimal interval between retries of opening a qpid connection. (integer +# value) +# Defaults to 0. # # [*qpid_reconnect_interval_max*] +# (Optional) Miximal interval between retries of opening a qpid connection. (integer +# value) +# Defaults to 0. # # [*qpid_sasl_mechanisms*] # (Optional) ENable one or more SASL mechanisms. @@ -337,33 +368,33 @@ class manila ( } manila_config { - 'DEFAULT/qpid_hostname': value => $qpid_hostname; - 'DEFAULT/qpid_port': value => $qpid_port; - 'DEFAULT/qpid_username': value => $qpid_username; - 'DEFAULT/qpid_password': value => $qpid_password, secret => true; - 'DEFAULT/qpid_reconnect': value => $qpid_reconnect; - 'DEFAULT/qpid_reconnect_timeout': value => $qpid_reconnect_timeout; - 'DEFAULT/qpid_reconnect_limit': value => $qpid_reconnect_limit; - 'DEFAULT/qpid_reconnect_interval_min': value => $qpid_reconnect_interval_min; - 'DEFAULT/qpid_reconnect_interval_max': value => $qpid_reconnect_interval_max; - 'DEFAULT/qpid_reconnect_interval': value => $qpid_reconnect_interval; - 'DEFAULT/qpid_heartbeat': value => $qpid_heartbeat; - 'DEFAULT/qpid_protocol': value => $qpid_protocol; - 'DEFAULT/qpid_tcp_nodelay': value => $qpid_tcp_nodelay; - 'DEFAULT/amqp_durable_queues': value => $amqp_durable_queues; + 'oslo_messaging_qpid/qpid_hostname': value => $qpid_hostname; + 'oslo_messaging_qpid/qpid_port': value => $qpid_port; + 'oslo_messaging_qpid/qpid_username': value => $qpid_username; + 'oslo_messaging_qpid/qpid_password': value => $qpid_password, secret => true; + 'oslo_messaging_qpid/qpid_heartbeat': value => $qpid_heartbeat; + 'oslo_messaging_qpid/qpid_protocol': value => $qpid_protocol; + 'oslo_messaging_qpid/qpid_tcp_nodelay': value => $qpid_tcp_nodelay; + 'oslo_messaging_qpid/amqp_durable_queues': value => $amqp_durable_queues; + 'oslo_messaging_qpid/qpid_reconnect': value => $qpid_reconnect; + 'oslo_messaging_qpid/qpid_reconnect_timeout': value => $qpid_reconnect_timeout; + 'oslo_messaging_qpid/qpid_reconnect_limit': value => $qpid_reconnect_limit; + 'oslo_messaging_qpid/qpid_reconnect_interval_min': value => $qpid_reconnect_interval_min; + 'oslo_messaging_qpid/qpid_reconnect_interval_max': value => $qpid_reconnect_interval_max; + 'oslo_messaging_qpid/qpid_reconnect_interval': value => $qpid_reconnect_interval; } if is_array($qpid_sasl_mechanisms) { manila_config { - 'DEFAULT/qpid_sasl_mechanisms': value => join($qpid_sasl_mechanisms, ' '); + 'oslo_messaging_qpid/qpid_sasl_mechanisms': value => join($qpid_sasl_mechanisms, ' '); } } elsif $qpid_sasl_mechanisms { manila_config { - 'DEFAULT/qpid_sasl_mechanisms': value => $qpid_sasl_mechanisms; + 'oslo_messaging_qpid/qpid_sasl_mechanisms': value => $qpid_sasl_mechanisms; } } else { manila_config { - 'DEFAULT/qpid_sasl_mechanisms': ensure => absent; + 'oslo_messaging_qpid/qpid_sasl_mechanisms': ensure => absent; } } } diff --git a/spec/classes/manila_spec.rb b/spec/classes/manila_spec.rb index eaecd64d..13009941 100644 --- a/spec/classes/manila_spec.rb +++ b/spec/classes/manila_spec.rb @@ -140,19 +140,19 @@ describe 'manila' do it { is_expected.to contain_manila_config('DEFAULT/sql_connection').with_value('mysql://user:password@host/database') } it { is_expected.to contain_manila_config('DEFAULT/rpc_backend').with_value('manila.openstack.common.rpc.impl_qpid') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_hostname').with_value('localhost') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_port').with_value('5672') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_username').with_value('guest') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_password').with_value('guest').with_secret(true) } - it { is_expected.to contain_manila_config('DEFAULT/qpid_reconnect').with_value(true) } - it { is_expected.to contain_manila_config('DEFAULT/qpid_reconnect_timeout').with_value('0') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_reconnect_limit').with_value('0') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_reconnect_interval_min').with_value('0') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_reconnect_interval_max').with_value('0') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_reconnect_interval').with_value('0') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_heartbeat').with_value('60') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_protocol').with_value('tcp') } - it { is_expected.to contain_manila_config('DEFAULT/qpid_tcp_nodelay').with_value(true) } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_port').with_value('5672') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_username').with_value('guest') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_password').with_value('guest').with_secret(true) } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_reconnect').with_value(true) } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_reconnect_timeout').with_value('0') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_reconnect_limit').with_value('0') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_reconnect_interval_min').with_value('0') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_reconnect_interval_max').with_value('0') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_reconnect_interval').with_value('0') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_heartbeat').with_value('60') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_tcp_nodelay').with_value(true) } end describe 'with qpid rpc and no qpid_sasl_mechanisms' do @@ -164,7 +164,7 @@ describe 'manila' do } end - it { is_expected.to contain_manila_config('DEFAULT/qpid_sasl_mechanisms').with_ensure('absent') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_sasl_mechanisms').with_ensure('absent') } end describe 'with qpid rpc and qpid_sasl_mechanisms string' do @@ -177,7 +177,7 @@ describe 'manila' do } end - it { is_expected.to contain_manila_config('DEFAULT/qpid_sasl_mechanisms').with_value('PLAIN') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_sasl_mechanisms').with_value('PLAIN') } end describe 'with qpid rpc and qpid_sasl_mechanisms array' do @@ -190,7 +190,7 @@ describe 'manila' do } end - it { is_expected.to contain_manila_config('DEFAULT/qpid_sasl_mechanisms').with_value('DIGEST-MD5 GSSAPI PLAIN') } + it { is_expected.to contain_manila_config('oslo_messaging_qpid/qpid_sasl_mechanisms').with_value('DIGEST-MD5 GSSAPI PLAIN') } end describe 'with SSL enabled' do