Merge pull request #18173 from bdunne/remove_incorrect_zone_seed

MiqServer.seed should not call Zone.seed
ManageIQ · Nov 8, 2018 · 879bc8f · 879bc8f
2 parents 951f7b4 + ff63ba1
commit 879bc8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/models/miq_server.rb b/app/models/miq_server.rb
@@ -154,7 +154,6 @@ def start
 
   def self.seed
     unless exists?(:guid => my_guid)
-      Zone.seed
       _log.info("Creating Default MiqServer with guid=[#{my_guid}], zone=[#{Zone.default_zone.name}]")
       create!(:guid => my_guid, :zone => Zone.default_zone)
       my_server_clear_cache

diff --git a/spec/models/miq_server_spec.rb b/spec/models/miq_server_spec.rb
@@ -1,5 +1,8 @@
 describe MiqServer do
-  include_examples ".seed called multiple times"
+  context ".seed" do
+    before { Zone.seed }
+    include_examples ".seed called multiple times"
+  end
 
   context "#hostname" do
     it("with a valid hostname")    { expect(MiqServer.new(:hostname => "test").hostname).to eq("test") }