Override name and delegate name= to provider

app/models/manageiq/providers/foreman/configuration_manager.rb

@@ -21,8 +21,6 @@ class ManageIQ::Providers::Foreman::ConfigurationManager < ManageIQ::Providers::
 
   belongs_to :provider, :autosave => true, :dependent => :destroy
 
-  before_save :ensure_provider_name_and_zone
-
   class << self
     delegate :params_for_create,
              :verify_credentials,
@@ -41,6 +39,12 @@ def provider
     super || ensure_provider
   end
 
+  def name
+    "#{provider.name} Configuration Manager"
+  end
+
+  delegate :name=, :zone, :zone=, :zone_id=, :to => :provider
+
   def image_name
     "foreman_configuration"
   end
@@ -52,17 +56,6 @@ def self.display_name(number = 1)
   private
 
   def ensure_provider
-    build_provider
-
-    provider.configuration_manager = self
-    provider.name = name
-    provider.zone = zone
-
-    provider
-  end
-
-  def ensure_provider_name_and_zone
-    provider.name = name.sub(/ Configuration Manager$/, '')
-    provider.zone = zone
+    build_provider.tap { |p| p.configuration_manager = self }
   end
 end

app/models/manageiq/providers/foreman/provider.rb

@@ -146,19 +146,10 @@ def verify_credentials(auth_type = nil, options = {})
 
   def ensure_managers
     build_provisioning_manager unless provisioning_manager
-    provisioning_manager.name     = "#{name} Provisioning Manager" unless name.end_with?(" Provisioning Manager")
     provisioning_manager.provider = self
 
     build_configuration_manager unless configuration_manager
-    configuration_manager.name     = "#{name} Configuration Manager" unless name.end_with?(" Configuration Manager")
     configuration_manager.provider = self
-
-    if zone_id_changed?
-      provisioning_manager.enabled = Zone.maintenance_zone&.id != zone_id
-      provisioning_manager.zone_id = zone_id
-      configuration_manager.enabled = Zone.maintenance_zone&.id != zone_id
-      configuration_manager.zone_id = zone_id
-    end
   end
 
   def self.refresh_ems(provider_ids)

app/models/manageiq/providers/foreman/provisioning_manager.rb

@@ -31,4 +31,20 @@ def self.description
   def self.supported_for_create?
     false
   end
+
+  def provider
+    super || ensure_provider
+  end
+
+  def name
+    "#{provider.name} Provisioning Manager"
+  end
+
+  delegate :name=, :zone, :zone=, :zone_id=, :to => :provider
+
+  private
+
+  def ensure_provider
+    build_provider.tap { |p| p.provisioning_manager = self }
+  end
 end