openstack/puppet-heat
Code Issues Proposed changes

Totally drop Qpid support

Browse Source 
Qpid was removed in Mitaka from Oslo Messaging, so now we can
drop it in manifests.

Change-Id: I5702e42ec50e3ea4612434f9d3c836d0b0356c29
This commit is contained in:
Denis Egorenko 2016-04-18 14:04:49 +03:00
parent fc324a840f
commit 6099d5c097
4 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/init.pp
View File

@ -232,32 +232,6 @@
# [*sql_connection*]
# Deprecated. Use database_connection instead.
#
# [*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 heat(
$auth_uri = 'http://127.0.0.1:5000/',
$identity_uri = 'http://127.0.0.1:35357/',
@ -313,19 +287,6 @@ class heat(
$mysql_module = undef,
$sql_connection = undef,
$instance_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 ::heat::logging

3
manifests/logging.pp
View File

@ -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*]

3
releasenotes/notes/drop_qpid-a1f943682593ae2d.yaml Normal file
View File

@ -0,0 +1,3 @@
---
other:
- Drop all Qpid support, it was removed from Oslo in Mitaka.

5
spec/classes/heat_logging_spec.rb
View File

@ -17,8 +17,7 @@ describe 'heat::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 'heat::logging' do
true)
is_expected.to contain_heat_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_heat_config('DEFAULT/fatal_deprecations').with_value(
true)