Send tenant with identity service requests

ManageIQ · Feb 8, 2018 · 4fc9c90 · 4fc9c90
1 parent 8c35f17
commit 4fc9c90
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/lib/manageiq/providers/openstack/legacy/openstack_handle/handle.rb b/lib/manageiq/providers/openstack/legacy/openstack_handle/handle.rb
@@ -172,16 +172,11 @@ def connect(options = {})
       opts.delete(:auth_type)
 
       unless tenant
-        tenant = "any_tenant" if service == "Identity"
         tenant ||= default_tenant_name
       end
-
-      unless service == "Identity"
-        opts[:openstack_tenant] = tenant
-        # For identity ,there is only domain scope, with project_name nil
-        opts[:openstack_project_name] = @project_name = tenant
-      end
-
+      opts[:openstack_tenant] = tenant
+      # For identity ,there is only domain scope, with project_name nil
+      opts[:openstack_project_name] = @project_name = tenant
       opts[:openstack_project_domain_id] = domain
       opts[:openstack_user_domain_id]    = domain
       opts[:openstack_region]            = region