Fixes compute object update failure due to autosign key after build

theforeman · Sep 13, 2024 · d49ba1f · d49ba1f
1 parent cc7fc16
commit d49ba1f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/models/foreman_salt/concerns/host_managed_extensions.rb b/app/models/foreman_salt/concerns/host_managed_extensions.rb
@@ -42,7 +42,7 @@ def inherited_attributes
 
         validate :salt_modules_in_host_environment
 
-        after_build :ensure_salt_autosign, if: ->(host) { host.salt_proxy }
+        before_provision :ensure_salt_autosign, if: ->(host) { host.salt_proxy }
         before_destroy :remove_salt_minion, if: ->(host) { host.salt_proxy }
       end
 

diff --git a/test/unit/host_extensions_test.rb b/test/unit/host_extensions_test.rb
@@ -64,18 +64,17 @@ class HostExtensionsTest < ActiveSupport::TestCase
 
     context 'autosign handling' do
       before do
-        @host = FactoryBot.create(:host, :managed)
+        @host = FactoryBot.create(:host, salt_autosign_key: 'asdfasdfasfasdf')
         @host.salt_proxy = @proxy
         stub_request(:post, "#{@proxy.url}/salt/autosign_key/asdfasdfasfasdf")
           .to_return(status: 200, body: '', headers: {})
         stub_request(:delete, "#{@proxy.url}/salt/key/#{@host.name}")
           .to_return(status: 200, body: '', headers: {})
       end
 
-      test 'host autosign is created when host is built' do
+      test 'host autosign is created before host is provisioned' do
         autosign_key = 'asdfasdfasfasdf'
-        @host.expects(:generate_provisioning_key).returns(autosign_key)
-        @host.build = true
+        @host.build = false
 
         assert @host.save!
         @host.clear_host_parameters_cache!