Add HDM to installer

- add HDM migrations - rename migrations to use the same naming scheme - add hdm to fixtures - add HDM to all pulpcore migration fixtures - also add hdm smart proxy data to fixtures Signed-off-by: Martin Alfke <[email protected]>
theforeman · Jul 30, 2024 · de26c75 · de26c75
1 parent 9d4ea59
commit de26c75
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 0 deletions.
diff --git a/config/foreman-answers.yaml b/config/foreman-answers.yaml
@@ -39,6 +39,7 @@ foreman::plugin::dlm: false
 foreman::plugin::expire_hosts: false
 foreman::plugin::git_templates: false
 foreman::plugin::google: false
+foreman::plugin::hdm: false
 foreman::plugin::host_extra_validator: false
 foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
@@ -71,6 +72,7 @@ foreman_proxy::plugin::dns::infoblox: false
 foreman_proxy::plugin::dns::powerdns: false
 foreman_proxy::plugin::dns::route53: false
 foreman_proxy::plugin::dynflow: false
+foreman_proxy::plugin::hdm: false
 foreman_proxy::plugin::monitoring: false
 foreman_proxy::plugin::omaha: false
 foreman_proxy::plugin::openscap: false

diff --git a/config/foreman-proxy-content-answers.yaml b/config/foreman-proxy-content-answers.yaml
@@ -36,6 +36,7 @@ foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::dns::infoblox: false
 foreman_proxy::plugin::dns::powerdns: false
 foreman_proxy::plugin::dns::route53: false
+foreman_proxy::plugin::hdm: false
 foreman_proxy::plugin::openscap: false
 foreman_proxy::plugin::remote_execution::script: false
 foreman_proxy::plugin::salt: false

diff --git a/config/foreman-proxy-content.migrations/20240219155518_hdm.rb b/config/foreman-proxy-content.migrations/20240219155518_hdm.rb
@@ -0,0 +1 @@
+answers['foreman_proxy::plugin::hdm'] ||= false
diff --git a/config/foreman.migrations/20240219155518_hdm.rb b/config/foreman.migrations/20240219155518_hdm.rb
@@ -0,0 +1,2 @@
+answers['foreman::plugin::hdm'] ||= false
+answers['foreman_proxy::plugin::hdm'] ||= false
diff --git a/config/katello-answers.yaml b/config/katello-answers.yaml
@@ -54,6 +54,7 @@ foreman::plugin::dlm: false
 foreman::plugin::expire_hosts: false
 foreman::plugin::git_templates: false
 foreman::plugin::google: false
+foreman::plugin::hdm: false
 foreman::plugin::kernel_care: false
 foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
@@ -96,6 +97,7 @@ foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::dns::infoblox: false
 foreman_proxy::plugin::dns::powerdns: false
 foreman_proxy::plugin::dns::route53: false
+foreman_proxy::plugin::hdm: false
 foreman_proxy::plugin::monitoring: false
 foreman_proxy::plugin::openscap: false
 foreman_proxy::plugin::remote_execution::script: false

diff --git a/config/katello.migrations/20240219155518_hdm.rb b/config/katello.migrations/20240219155518_hdm.rb
@@ -0,0 +1,2 @@
+answers['foreman::plugin::hdm'] ||= false
+answers['foreman_proxy::plugin::hdm'] ||= false
diff --git a/...xtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml b/...xtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml
@@ -22,6 +22,7 @@ foreman::plugin::dhcp_browser: false
 foreman::plugin::expire_hosts: false
 foreman::plugin::git_templates: false
 foreman::plugin::google: false
+foreman::plugin::hdm: false
 foreman::plugin::kernel_care: false
 foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
@@ -46,6 +47,7 @@ foreman_proxy::plugin::dhcp::remote_isc: false
 foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::dns::powerdns: false
 foreman_proxy::plugin::dns::route53: false
+foreman_proxy::plugin::hdm: false
 foreman_proxy::plugin::monitoring: false
 foreman_proxy::plugin::salt: false
 foreman_proxy::plugin::shellhooks: 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
@@ -22,6 +22,7 @@ foreman::plugin::dhcp_browser: false
 foreman::plugin::expire_hosts: false
 foreman::plugin::git_templates: false
 foreman::plugin::google: false
+foreman::plugin::hdm: false
 foreman::plugin::kernel_care: false
 foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
@@ -46,6 +47,7 @@ foreman_proxy::plugin::dhcp::remote_isc: false
 foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::dns::powerdns: false
 foreman_proxy::plugin::dns::route53: false
+foreman_proxy::plugin::hdm: false
 foreman_proxy::plugin::monitoring: false
 foreman_proxy::plugin::salt: false
 foreman_proxy::plugin::shellhooks: false

diff --git a/spec/fixtures/pulpcore-migration/katello-answers-after.yaml b/spec/fixtures/pulpcore-migration/katello-answers-after.yaml
@@ -22,6 +22,7 @@ foreman::plugin::dhcp_browser: false
 foreman::plugin::expire_hosts: false
 foreman::plugin::git_templates: false
 foreman::plugin::google: false
+foreman::plugin::hdm: false
 foreman::plugin::kernel_care: false
 foreman::plugin::kubevirt: false
 foreman::plugin::leapp: false
@@ -46,6 +47,7 @@ foreman_proxy::plugin::dhcp::remote_isc: false
 foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::dns::powerdns: false
 foreman_proxy::plugin::dns::route53: false
+foreman_proxy::plugin::hdm: false
 foreman_proxy::plugin::monitoring: false
 foreman_proxy::plugin::salt: false
 foreman_proxy::plugin::shellhooks: false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		answers['foreman_proxy::plugin::hdm'] \|\|= false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		answers['foreman::plugin::hdm'] \|\|= false
		answers['foreman_proxy::plugin::hdm'] \|\|= false