From 58e9f54a3a8e8b8ed3e0fda25e0c69161834b265 Mon Sep 17 00:00:00 2001 From: Alexander Demichev Date: Fri, 2 Feb 2018 15:54:18 +0100 Subject: [PATCH] remove undercloud from filtered result --- app/controllers/application_controller/network.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller/network.rb b/app/controllers/application_controller/network.rb index 95e656c53bb..3f2bf87274d 100644 --- a/app/controllers/application_controller/network.rb +++ b/app/controllers/application_controller/network.rb @@ -2,7 +2,8 @@ module ApplicationController::Network extend ActiveSupport::Concern def network_managers - openstack_network_manager = Rbac::Filterer.filtered(ManageIQ::Providers::Openstack::NetworkManager).select(:id, :name, :parent_ems_id) + ems_clouds = ManageIQ::Providers::Openstack::NetworkManager.joins(:parent_manager).where(:parent_managers_ext_management_systems=>{:type=>'ManageIQ::Providers::Openstack::CloudManager'}) + openstack_network_manager = Rbac::Filterer.filtered(ems_clouds).select(:id, :name, :parent_ems_id) redhat_network_manager = Rbac::Filterer.filtered(ManageIQ::Providers::Redhat::NetworkManager).select(:id, :name, :parent_ems_id) openstack_network_manager + redhat_network_manager end