Totally drop Qpid support

Qpid was removed in Mitaka from Oslo Messaging, so now we can drop it in manifests. Change-Id: I336c99b7709f061734ca09128a366361f13a934e
2016-04-18 14:15:05 +03:00 · 2016-04-18 14:15:05 +03:00 · af8da24358
parent e648bb5830
commit af8da24358
10 changed files with 15 additions and 56 deletions
--- a/manifests/api/logging.pp
+++ b/manifests/api/logging.pp
@ -65,8 +65,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*]
--- a/manifests/cache/logging.pp
+++ b/manifests/cache/logging.pp
@ -65,8 +65,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*]
--- a/manifests/glare/logging.pp
+++ b/manifests/glare/logging.pp
@ -65,8 +65,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*]
--- a/manifests/notify/qpid.pp
+++ b/manifests/notify/qpid.pp
@ -1,36 +0,0 @@
-# == Class: glance::notify::qpid
-#
-# used to configure qpid notifications for glance
-# Deprecated class
-#
-# === Parameters:
-#
-# [*qpid_password*]
-#   (required) Password to connect to the qpid server.
-#
-# [*qpid_username*]
-#   (Optional) User to connect to the qpid server.
-#   Defaults to 'guest'.
-#
-# [*qpid_hostname*]
-#   (Optional) IP or hostname of the qpid server.
-#   Defaults to 'localhost'.
-#
-# [*qpid_port*]
-#   (Optional) Port of the qpid server.
-#   Defaults to 5672.
-#
-# [*qpid_protocol*]
-#   (Optional) Protocol to use for qpid (tcp/ssl).
-#   Defaults to tcp.
-#
-class glance::notify::qpid(
-  $qpid_password = undef,
-  $qpid_username = undef,
-  $qpid_hostname = undef,
-  $qpid_port     = undef,
-  $qpid_protocol = undef
-) inherits glance::api {
-
-  warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
-}
--- a/manifests/registry/logging.pp
+++ b/manifests/registry/logging.pp
@ -65,8 +65,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*]
--- a/releasenotes/notes/drop_qpid-422ed20407bf9e03.yaml
+++ b/releasenotes/notes/drop_qpid-422ed20407bf9e03.yaml
@ -0,0 +1,3 @@
+---
+other:
+  - Drop all Qpid support, it was removed from Oslo in Mitaka.
--- a/spec/classes/glance_api_logging_spec.rb
+++ b/spec/classes/glance_api_logging_spec.rb
@ -17,8 +17,7 @@ describe 'glance::api::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] ',
@ -99,7 +98,7 @@ describe 'glance::api::logging' do
        true)

      is_expected.to contain_glance_api_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_glance_api_config('DEFAULT/fatal_deprecations').with_value(
        true)
--- a/spec/classes/glance_cache_logging_spec.rb
+++ b/spec/classes/glance_cache_logging_spec.rb
@ -17,8 +17,7 @@ describe 'glance::cache::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] ',
@ -99,7 +98,7 @@ describe 'glance::cache::logging' do
        true)

      is_expected.to contain_glance_cache_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_glance_cache_config('DEFAULT/fatal_deprecations').with_value(
        true)
--- a/spec/classes/glance_glare_logging_spec.rb
+++ b/spec/classes/glance_glare_logging_spec.rb
@ -17,8 +17,7 @@ describe 'glance::glare::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] ',
@ -99,7 +98,7 @@ describe 'glance::glare::logging' do
        true)

      is_expected.to contain_glance_glare_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_glance_glare_config('DEFAULT/fatal_deprecations').with_value(
        true)
--- a/spec/classes/glance_registry_logging_spec.rb
+++ b/spec/classes/glance_registry_logging_spec.rb
@ -17,8 +17,7 @@ describe 'glance::registry::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] ',
@ -99,7 +98,7 @@ describe 'glance::registry::logging' do
        true)

      is_expected.to contain_glance_registry_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_glance_registry_config('DEFAULT/fatal_deprecations').with_value(
        true)