From b4b1271a7dccbecc347c4b0e817da0ae6fd117ba Mon Sep 17 00:00:00 2001
From: Maximilian Kolb <kolb@atix.de>
Date: Tue, 18 Feb 2025 13:39:21 +0100
Subject: [PATCH] Fixes #38228 - Add Hammer CLI for foreman_bootdisk

Refs GitHub PR 1213 in puppet-foreman
Based on 73df3c20d55ac38f8287f5efbf181259432ea383
---
 config/foreman-answers.yaml                                      | 1 +
 .../foreman.migrations/250218123832_add_hammer_cli_bootdisk.rb   | 1 +
 config/katello-answers.yaml                                      | 1 +
 .../katello.migrations/250218123832-add-hammer-cli-bootdisk.rb   | 1 +
 .../katello-answers-after.yaml                                   | 1 +
 .../pulpcore-migration-rpm-only/katello-answers-after.yaml       | 1 +
 spec/fixtures/pulpcore-migration/katello-answers-after.yaml      | 1 +
 7 files changed, 7 insertions(+)
 create mode 100644 config/foreman.migrations/250218123832_add_hammer_cli_bootdisk.rb
 create mode 100644 config/katello.migrations/250218123832-add-hammer-cli-bootdisk.rb

diff --git a/config/foreman-answers.yaml b/config/foreman-answers.yaml
index 4a16b1f5..ac6e8b5a 100644
--- a/config/foreman-answers.yaml
+++ b/config/foreman-answers.yaml
@@ -13,6 +13,7 @@ foreman: {}
 foreman::cli: true
 foreman::cli::ansible: false
 foreman::cli::azure: false
+foreman::cli::bootdisk: false
 foreman::cli::discovery: false
 foreman::cli::google: false
 foreman::cli::kubevirt: false
diff --git a/config/foreman.migrations/250218123832_add_hammer_cli_bootdisk.rb b/config/foreman.migrations/250218123832_add_hammer_cli_bootdisk.rb
new file mode 100644
index 00000000..654bfef4
--- /dev/null
+++ b/config/foreman.migrations/250218123832_add_hammer_cli_bootdisk.rb
@@ -0,0 +1 @@
+answers['foreman::cli::bootdisk'] ||= false
diff --git a/config/katello-answers.yaml b/config/katello-answers.yaml
index 63850f83..dc9dc441 100644
--- a/config/katello-answers.yaml
+++ b/config/katello-answers.yaml
@@ -25,6 +25,7 @@ foreman:
 foreman::cli: true
 foreman::cli::ansible: false
 foreman::cli::azure: false
+foreman::cli::bootdisk: false
 foreman::cli::discovery: false
 foreman::cli::google: false
 foreman::cli::katello: true
diff --git a/config/katello.migrations/250218123832-add-hammer-cli-bootdisk.rb b/config/katello.migrations/250218123832-add-hammer-cli-bootdisk.rb
new file mode 100644
index 00000000..654bfef4
--- /dev/null
+++ b/config/katello.migrations/250218123832-add-hammer-cli-bootdisk.rb
@@ -0,0 +1 @@
+answers['foreman::cli::bootdisk'] ||= false
diff --git a/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml b/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml
index 0fef31ee..ed2053e9 100644
--- a/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml
+++ b/spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml
@@ -1,6 +1,7 @@
 foreman::cli: true
 foreman::cli::ansible: false
 foreman::cli::azure: false
+foreman::cli::bootdisk: false
 foreman::cli::google: false
 foreman::cli::katello: true
 foreman::cli::kubevirt: false
diff --git a/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml b/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml
index 147de8ad..89c4873a 100644
--- a/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml
+++ b/spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml
@@ -1,6 +1,7 @@
 foreman::cli: true
 foreman::cli::ansible: false
 foreman::cli::azure: false
+foreman::cli::bootdisk: false
 foreman::cli::google: false
 foreman::cli::katello: true
 foreman::cli::kubevirt: false
diff --git a/spec/fixtures/pulpcore-migration/katello-answers-after.yaml b/spec/fixtures/pulpcore-migration/katello-answers-after.yaml
index 0b20ec6b..60b4e9e8 100644
--- a/spec/fixtures/pulpcore-migration/katello-answers-after.yaml
+++ b/spec/fixtures/pulpcore-migration/katello-answers-after.yaml
@@ -1,6 +1,7 @@
 foreman::cli: true
 foreman::cli::ansible: false
 foreman::cli::azure: false
+foreman::cli::bootdisk: false
 foreman::cli::google: false
 foreman::cli::katello: true
 foreman::cli::kubevirt: false