Merge pull request #14741 from Ladas/ensure_managers_change_zone_and_…

…provider_region_with_cloud_manager Method for ensuring managers change zone and provider region with CloudManager
ManageIQ · Apr 12, 2017 · 9cae782 · 9cae782
2 parents 3ad8333 + dc57d4c
commit 9cae782
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/app/models/mixins/has_network_manager_mixin.rb b/app/models/mixins/has_network_manager_mixin.rb
@@ -27,9 +27,15 @@ module HasNetworkManagerMixin
 
     def ensure_managers
       ensure_network_manager
-      network_manager.name            = "#{name} Network Manager"
-      network_manager.zone_id         = zone_id
-      network_manager.provider_region = provider_region
+      network_manager.name = "#{name} Network Manager"
+      ensure_managers_zone_and_provider_region
+    end
+
+    def ensure_managers_zone_and_provider_region
+      if network_manager
+        network_manager.zone_id         = zone_id
+        network_manager.provider_region = provider_region
+      end
     end
   end
 end