From cb5497bf99381e5a86f0fb8b73a25431b0b324f5 Mon Sep 17 00:00:00 2001 From: Nick LaMuro Date: Mon, 4 May 2020 15:56:17 -0500 Subject: [PATCH 1/2] Rails 6.0 --- manageiq-providers-openstack.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manageiq-providers-openstack.gemspec b/manageiq-providers-openstack.gemspec index 308b694a6..a8503aef3 100644 --- a/manageiq-providers-openstack.gemspec +++ b/manageiq-providers-openstack.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency "activesupport", "~> 5.2.4", ">= 5.2.4.3" + spec.add_dependency "activesupport", "~> 6.0" spec.add_dependency "bunny", "~> 2.1.0" spec.add_dependency "excon", "~> 0.71" spec.add_dependency "fog-openstack", ">= 0.3.10" From 2b20c81079b155c9afe16daae55a859ae0a6df4b Mon Sep 17 00:00:00 2001 From: NickLaMuro Date: Wed, 4 Nov 2020 15:54:25 -0600 Subject: [PATCH 2/2] [rails6][CloudManager] Use .module_parent .parent is deprecated in Rails 6, so use it's replacement .module_parent --- app/models/manageiq/providers/openstack/cloud_manager.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/manageiq/providers/openstack/cloud_manager.rb b/app/models/manageiq/providers/openstack/cloud_manager.rb index 6a5e8b1f2..574432fb9 100644 --- a/app/models/manageiq/providers/openstack/cloud_manager.rb +++ b/app/models/manageiq/providers/openstack/cloud_manager.rb @@ -38,9 +38,9 @@ class ManageIQ::Providers::Openstack::CloudManager < ManageIQ::Providers::CloudM supports :provisioning supports :cloud_tenants supports :cloud_tenant_mapping do - if defined?(self.class.parent::CloudManager::CloudTenant) && !tenant_mapping_enabled? + if defined?(self.class.module_parent::CloudManager::CloudTenant) && !tenant_mapping_enabled? unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is disabled on the Provider")) - elsif !defined?(self.class.parent::CloudManager::CloudTenant) + elsif !defined?(self.class.module_parent::CloudManager::CloudTenant) unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is supported only when CloudTenant exists "\ "on the CloudManager")) end