diff --git a/manifests/init.pp b/manifests/init.pp index 8ef0d448..8d82ac62 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -176,22 +176,6 @@ # Enable dbsync # Defaults to true # -# DEPRECATED PARAMETERS -# -# [*qpid_hostname*] -# [*qpid_port*] -# [*qpid_username*] -# [*qpid_password*] -# [*qpid_heartbeat*] -# [*qpid_protocol*] -# [*qpid_tcp_nodelay*] -# [*qpid_reconnect*] -# [*qpid_reconnect_timeout*] -# [*qpid_reconnect_limit*] -# [*qpid_reconnect_interval*] -# [*qpid_reconnect_interval_min*] -# [*qpid_reconnect_interval_max*] -# class ironic ( $enabled = true, $package_ensure = 'present', @@ -231,19 +215,6 @@ class ironic ( $sync_db = true, # DEPRECATED PARAMETERS $rabbit_user = undef, - $qpid_hostname = undef, - $qpid_port = undef, - $qpid_username = undef, - $qpid_password = undef, - $qpid_heartbeat = undef, - $qpid_protocol = undef, - $qpid_tcp_nodelay = undef, - $qpid_reconnect = undef, - $qpid_reconnect_timeout = undef, - $qpid_reconnect_limit = undef, - $qpid_reconnect_interval_min = undef, - $qpid_reconnect_interval_max = undef, - $qpid_reconnect_interval = undef, ) { include ::ironic::logging @@ -355,8 +326,4 @@ class ironic ( } } - if $rpc_backend == 'ironic.openstack.common.rpc.impl_qpid' or $rpc_backend == 'qpid' { - warning('Qpid driver is removed from Oslo.messaging in the Mitaka release') - } - } diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index 299c54f1..98164f90 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/logging.pp @@ -61,8 +61,7 @@ # Defaults to $::os_service_default # Example: # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', -# 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', -# 'iso8601' => 'WARN', +# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', # 'requests.packages.urllib3.connectionpool' => 'WARN' } # # [*publish_errors*] diff --git a/manifests/logging.pp b/manifests/logging.pp index 281e1dd4..c41f6b74 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -61,8 +61,7 @@ # Defaults to $::os_service_default # Example: # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', -# 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', -# 'iso8601' => 'WARN', +# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', # 'requests.packages.urllib3.connectionpool' => 'WARN' } # # [*publish_errors*] diff --git a/releasenotes/notes/drop_qpid-5648277d914993c1.yaml b/releasenotes/notes/drop_qpid-5648277d914993c1.yaml new file mode 100644 index 00000000..6cda35ff --- /dev/null +++ b/releasenotes/notes/drop_qpid-5648277d914993c1.yaml @@ -0,0 +1,3 @@ +--- +other: + - Drop all Qpid support, it was removed from Oslo in Mitaka. diff --git a/spec/classes/ironic_inspector_logging_spec.rb b/spec/classes/ironic_inspector_logging_spec.rb index f1615bd0..27c5621d 100644 --- a/spec/classes/ironic_inspector_logging_spec.rb +++ b/spec/classes/ironic_inspector_logging_spec.rb @@ -17,8 +17,7 @@ describe 'ironic::inspector::logging' do :publish_errors => true, :default_log_levels => { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', - 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', - 'iso8601' => 'WARN', + 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', 'requests.packages.urllib3.connectionpool' => 'WARN' }, :fatal_deprecations => true, :instance_format => '[instance: %(uuid)s] ', @@ -96,7 +95,7 @@ describe 'ironic::inspector::logging' do true) is_expected.to contain_ironic_inspector_config('DEFAULT/default_log_levels').with_value( - 'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,qpid=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO') + 'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO') is_expected.to contain_ironic_inspector_config('DEFAULT/fatal_deprecations').with_value( true) diff --git a/spec/classes/ironic_logging_spec.rb b/spec/classes/ironic_logging_spec.rb index 9de79db8..ca203d85 100644 --- a/spec/classes/ironic_logging_spec.rb +++ b/spec/classes/ironic_logging_spec.rb @@ -17,8 +17,7 @@ describe 'ironic::logging' do :publish_errors => true, :default_log_levels => { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', - 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', - 'iso8601' => 'WARN', + 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', 'requests.packages.urllib3.connectionpool' => 'WARN' }, :fatal_deprecations => true, :instance_format => '[instance: %(uuid)s] ', @@ -96,7 +95,7 @@ describe 'ironic::logging' do true) is_expected.to contain_ironic_config('DEFAULT/default_log_levels').with_value( - 'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,qpid=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO') + 'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO') is_expected.to contain_ironic_config('DEFAULT/fatal_deprecations').with_value( true)