From dd53e39b11ed87e48593c28a80c4590f924c3e28 Mon Sep 17 00:00:00 2001
From: Denis Egorenko <degorenko@mirantis.com>
Date: Thu, 3 Dec 2015 19:35:57 +0300
Subject: [PATCH] Remove qpid messaging support

Qpid messaging driver is removed from Oslo.messaging [1]
Therefore, we cannot support it anymore.

[1] I4a9cba314c4a2f24307504fa7b5427424268b114

Change-Id: I5a702aacf77956a6c616fd98d2f942654548f00d
---
 manifests/notify/qpid.pp                | 21 +++------
 spec/classes/glance_notify_qpid_spec.rb | 57 -------------------------
 2 files changed, 7 insertions(+), 71 deletions(-)
 delete mode 100644 spec/classes/glance_notify_qpid_spec.rb

diff --git a/manifests/notify/qpid.pp b/manifests/notify/qpid.pp
index 7d12e162..7909baee 100644
--- a/manifests/notify/qpid.pp
+++ b/manifests/notify/qpid.pp
@@ -1,6 +1,7 @@
 # == Class: glance::notify::qpid
 #
 # used to configure qpid notifications for glance
+# Deprecated class
 #
 # === Parameters:
 #
@@ -24,20 +25,12 @@
 #   Defaults to tcp.
 #
 class glance::notify::qpid(
-  $qpid_password,
-  $qpid_username = 'guest',
-  $qpid_hostname = 'localhost',
-  $qpid_port     = '5672',
-  $qpid_protocol = 'tcp'
+  $qpid_password = undef,
+  $qpid_username = undef,
+  $qpid_hostname = undef,
+  $qpid_port     = undef,
+  $qpid_protocol = undef
 ) inherits glance::api {
 
-  glance_api_config {
-    'DEFAULT/notifier_driver':           value => 'qpid';
-    'oslo_messaging_qpid/qpid_hostname': value => $qpid_hostname;
-    'oslo_messaging_qpid/qpid_port':     value => $qpid_port;
-    'oslo_messaging_qpid/qpid_protocol': value => $qpid_protocol;
-    'oslo_messaging_qpid/qpid_username': value => $qpid_username;
-    'oslo_messaging_qpid/qpid_password': value => $qpid_password, secret => true;
-  }
-
+  warning('Qpid driver is removed from Oslo.messaging in the Mitaka release')
 }
diff --git a/spec/classes/glance_notify_qpid_spec.rb b/spec/classes/glance_notify_qpid_spec.rb
deleted file mode 100644
index 2cf8fd4c..00000000
--- a/spec/classes/glance_notify_qpid_spec.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'spec_helper'
-describe 'glance::notify::qpid' do
-  let :facts do
-    @default_facts.merge({
-      :osfamily       => 'Debian',
-    })
-  end
-
-  let :pre_condition do
-    'class { "glance::api": keystone_password => "pass" }'
-  end
-
-  describe 'when default params and qpid_password' do
-    let :params do
-      {:qpid_password => 'pass'}
-    end
-
-    it { is_expected.to contain_glance_api_config('DEFAULT/notifier_driver').with_value('qpid') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_password').with_value('pass') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_password').with_value(params[:qpid_password]).with_secret(true) }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5672') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
-  end
-
-  describe 'when passing params' do
-    let :params do
-      {
-        :qpid_password => 'pass2',
-        :qpid_username => 'guest2',
-        :qpid_hostname => 'localhost2',
-        :qpid_port     => '5673'
-      }
-    end
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest2') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost2') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5673') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('tcp') }
-  end
-
-  describe 'when configuring with ssl' do
-    let :params do
-      {
-        :qpid_password => 'pass3',
-        :qpid_username => 'guest3',
-        :qpid_hostname => 'localhost3',
-        :qpid_port     => '5671',
-        :qpid_protocol => 'ssl'
-      }
-    end
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_username').with_value('guest3') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_hostname').with_value('localhost3') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_port').with_value('5671') }
-    it { is_expected.to contain_glance_api_config('oslo_messaging_qpid/qpid_protocol').with_value('ssl') }
-  end
-end