From 6099d5c09780a1477be388477a3c0c97c98cac7d Mon Sep 17 00:00:00 2001
From: Denis Egorenko <degorenko@mirantis.com>
Date: Mon, 18 Apr 2016 14:04:49 +0300
Subject: [PATCH] Totally drop Qpid support

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

Change-Id: I5702e42ec50e3ea4612434f9d3c836d0b0356c29
---
 manifests/init.pp                             | 39 -------------------
 manifests/logging.pp                          |  3 +-
 .../notes/drop_qpid-a1f943682593ae2d.yaml     |  3 ++
 spec/classes/heat_logging_spec.rb             |  5 +--
 4 files changed, 6 insertions(+), 44 deletions(-)
 create mode 100644 releasenotes/notes/drop_qpid-a1f943682593ae2d.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 3bf6d825..724b7190 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 84efd0bd..0a441823 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-a1f943682593ae2d.yaml b/releasenotes/notes/drop_qpid-a1f943682593ae2d.yaml
new file mode 100644
index 00000000..6cda35ff
--- /dev/null
+++ b/releasenotes/notes/drop_qpid-a1f943682593ae2d.yaml
@@ -0,0 +1,3 @@
+---
+other:
+  - Drop all Qpid support, it was removed from Oslo in Mitaka.
diff --git a/spec/classes/heat_logging_spec.rb b/spec/classes/heat_logging_spec.rb
index b448c428..244240a1 100644
--- a/spec/classes/heat_logging_spec.rb
+++ b/spec/classes/heat_logging_spec.rb
@@ -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)