From de26c75efc9e6a6224dc0bd8dadee762faf2f163 Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Mon, 19 Feb 2024 16:58:46 +0100 Subject: [PATCH] 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 --- config/foreman-answers.yaml | 2 ++ config/foreman-proxy-content-answers.yaml | 1 + config/foreman-proxy-content.migrations/20240219155518_hdm.rb | 1 + config/foreman.migrations/20240219155518_hdm.rb | 2 ++ config/katello-answers.yaml | 2 ++ config/katello.migrations/20240219155518_hdm.rb | 2 ++ .../katello-answers-after.yaml | 2 ++ .../pulpcore-migration-rpm-only/katello-answers-after.yaml | 2 ++ spec/fixtures/pulpcore-migration/katello-answers-after.yaml | 2 ++ 9 files changed, 16 insertions(+) create mode 100644 config/foreman-proxy-content.migrations/20240219155518_hdm.rb create mode 100644 config/foreman.migrations/20240219155518_hdm.rb create mode 100644 config/katello.migrations/20240219155518_hdm.rb diff --git a/config/foreman-answers.yaml b/config/foreman-answers.yaml index 45ce59e8..26088a57 100644 --- 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 index 7276e4b4..549d5be5 100644 --- 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 new file mode 100644 index 00000000..4b1159bd --- /dev/null +++ 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 new file mode 100644 index 00000000..6c7e6b1d --- /dev/null +++ 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 index 3a309d75..e210ef90 100644 --- 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 new file mode 100644 index 00000000..6c7e6b1d --- /dev/null +++ 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/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 ffb02a2f..ce89a573 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 @@ -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 index f38f8019..d3d568d0 100644 --- 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 index 70052db4..415ceb1f 100644 --- 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