AMQP validation always returned true

AMQP validation always returned true. Fixes BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1265638
ManageIQ · Dec 8, 2015 · 2c58e6f · 2c58e6f
1 parent cdc3b64
commit 2c58e6f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/models/manageiq/providers/openstack/manager_mixin.rb b/app/models/manageiq/providers/openstack/manager_mixin.rb
@@ -107,7 +107,6 @@ def verify_api_credentials(options = {})
   def verify_amqp_credentials(_options = {})
     require 'openstack/openstack_event_monitor'
     OpenstackEventMonitor.test_amqp_connection(event_monitor_options)
-    true
   rescue => err
     miq_exception = translate_exception(err)
     raise unless miq_exception

diff --git a/gems/pending/openstack/openstack_event_monitor.rb b/gems/pending/openstack/openstack_event_monitor.rb
@@ -14,7 +14,7 @@ def self.new(options = {})
   end
 
   def self.available?(options)
-    !event_monitor_class(options).kind_of? OpenstackNullEventMonitor
+    event_monitor_class(options) != OpenstackNullEventMonitor
   end
 
   DEFAULT_PLUGIN_PRIORITY = 0