CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [25.2.0](https://github.com/theforeman/puppet-foreman/tree/25.2.0) (2024-08-14)
+
+[Full Changelog](https://github.com/theforeman/puppet-foreman/compare/25.1.0...25.2.0)
+
+**Implemented enhancements:**
+
+- Allow forcing fact upload when host already exists [\#1175](https://github.com/theforeman/puppet-foreman/pull/1175) ([evgeni](https://github.com/evgeni))
+
+**Fixed bugs:**
+
+- Fix a typo in hammer\_root.yml.epp [\#1173](https://github.com/theforeman/puppet-foreman/pull/1173) ([asteflova](https://github.com/asteflova))
+
 ## [25.1.0](https://github.com/theforeman/puppet-foreman/tree/25.1.0) (2024-08-12)
 
 [Full Changelog](https://github.com/theforeman/puppet-foreman/compare/25.0.0...25.1.0)

lib/puppet/provider/foreman_host/rest_v3.rb

@@ -2,7 +2,7 @@
   confine :feature => [:json, :oauth]
 
   def exists?
-    !id.nil?
+    !resource[:force_fact_upload] && !id.nil?
   end
 
   def create

lib/puppet/type/foreman_host.rb

@@ -11,4 +11,8 @@
 
     defaultto { $facts }
   end
+
+  newparam(:force_fact_upload) do
+    desc 'Force fact upload when host already exists'
+  end
 end

manifests/register.pp

@@ -2,16 +2,18 @@
 # @api private
 class foreman::register (
   Stdlib::Fqdn $foreman_host_name = $facts['networking']['fqdn'],
+  Boolean $force_fact_upload = false,
 ) {
   foreman_host { "foreman-${$foreman_host_name}":
-    ensure          => present,
-    hostname        => $foreman_host_name,
-    base_url        => $foreman::foreman_url,
-    consumer_key    => $foreman::oauth_consumer_key,
-    consumer_secret => $foreman::oauth_consumer_secret,
-    effective_user  => $foreman::oauth_effective_user,
-    ssl_ca          => $foreman::server_ssl_chain,
-    facts           => $facts,
+    ensure            => present,
+    hostname          => $foreman_host_name,
+    base_url          => $foreman::foreman_url,
+    consumer_key      => $foreman::oauth_consumer_key,
+    consumer_secret   => $foreman::oauth_consumer_secret,
+    effective_user    => $foreman::oauth_effective_user,
+    ssl_ca            => $foreman::server_ssl_chain,
+    facts             => $facts,
+    force_fact_upload => $force_fact_upload,
   }
 
   foreman_instance_host { "foreman-${$foreman_host_name}":

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-foreman",
-  "version": "25.1.0",
+  "version": "25.2.0",
   "author": "theforeman",
   "summary": "Foreman server configuration",
   "license": "GPL-3.0+",

spec/classes/foreman_cli_spec.rb

@@ -52,7 +52,7 @@
               .with_content(
                 <<~CONFIG
                   :foreman:
-                    # Credentials. You'll be asked for the interactively if you leave them blank here
+                    # Credentials. You'll be asked for them interactively if you leave them blank here
                     :username: 'joe'
                     :password: 'secret'
                 CONFIG
@@ -161,7 +161,7 @@ class { 'foreman':
             .with_content(
               <<~CONFIG
                 :foreman:
-                  # Credentials. You'll be asked for the interactively if you leave them blank here
+                  # Credentials. You'll be asked for them interactively if you leave them blank here
                   :username: 'jane'
                   :password: 'supersecret'
               CONFIG

templates/hammer_root.yml.epp

@@ -3,6 +3,6 @@
   Optional[String] $password,
 | -%>
 :foreman:
-  # Credentials. You'll be asked for the interactively if you leave them blank here
+  # Credentials. You'll be asked for them interactively if you leave them blank here
   :username: '<%= $username %>'
   :password: '<%= $password %>'