Skip to content

Commit

Permalink
Stop trying to remove deleted parameters
Browse files Browse the repository at this point in the history
Kafo does this automatically and there's no need to write migrations for
this. That was a misunderstanding on my side.
  • Loading branch information
ekohl committed Aug 26, 2021
1 parent 9e4d03c commit 071cd88
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 150 deletions.
Original file line number Diff line number Diff line change
@@ -1,44 +1,3 @@
DELETED = {
'foreman' => [
'custom_repo',
'dynflow_in_core',
'email_conf',
'email_config_method',
'email_source',
'puppet_home',
'puppet_ssldir',
],
'foreman_proxy' => [
'custom_repo',
'puppetca_modular',
'realm_split_config_files',
'use_autosignfile',
],
'foreman_proxy::plugin::dhcp::infoblox' => [
'use_ranges',
],
'puppet' => [
'agent_template',
'main_template',
'server_app_root',
'server_ca_proxy',
'server_directory_environments',
'server_dynamic_environments',
'server_environments',
'server_http_allow',
'server_httpd_service',
'server_implementation',
'server_main_template',
'server_passenger',
'server_passenger_min_instances',
'server_passenger_pre_start',
'server_passenger_ruby',
'server_rack_arguments',
'server_service_fallback',
'server_template',
],
}.freeze

CLEAR = {
'foreman' => [
'authentication',
Expand All @@ -51,15 +10,6 @@
],
}.freeze

DELETED.each do |mod, parameters|
mod_answers = answers[mod]
next unless mod_answers.is_a?(Hash)

parameters.each do |parameter|
mod_answers.delete(parameter)
end
end

CLEAR.each do |mod, parameters|
mod_answers = answers[mod]
next unless mod_answers.is_a?(Hash)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,44 +1,3 @@
DELETED = {
'foreman' => [
'custom_repo',
'dynflow_in_core',
'email_conf',
'email_config_method',
'email_source',
'puppet_home',
'puppet_ssldir',
],
'foreman_proxy' => [
'custom_repo',
'puppetca_modular',
'realm_split_config_files',
'use_autosignfile',
],
'foreman_proxy::plugin::dhcp::infoblox' => [
'use_ranges',
],
'puppet' => [
'agent_template',
'main_template',
'server_app_root',
'server_ca_proxy',
'server_directory_environments',
'server_dynamic_environments',
'server_environments',
'server_http_allow',
'server_httpd_service',
'server_implementation',
'server_main_template',
'server_passenger',
'server_passenger_min_instances',
'server_passenger_pre_start',
'server_passenger_ruby',
'server_rack_arguments',
'server_service_fallback',
'server_template',
],
}.freeze

CLEAR = {
'foreman' => [
'authentication',
Expand All @@ -51,15 +10,6 @@
],
}.freeze

DELETED.each do |mod, parameters|
mod_answers = answers[mod]
next unless mod_answers.is_a?(Hash)

parameters.each do |parameter|
mod_answers.delete(parameter)
end
end

CLEAR.each do |mod, parameters|
mod_answers = answers[mod]
next unless mod_answers.is_a?(Hash)
Expand Down
50 changes: 0 additions & 50 deletions config/katello.migrations/190111180118-delete-removed-settings.rb
Original file line number Diff line number Diff line change
@@ -1,44 +1,3 @@
DELETED = {
'foreman' => [
'custom_repo',
'dynflow_in_core',
'email_conf',
'email_config_method',
'email_source',
'puppet_home',
'puppet_ssldir',
],
'foreman_proxy' => [
'custom_repo',
'puppetca_modular',
'realm_split_config_files',
'use_autosignfile',
],
'foreman_proxy::plugin::dhcp::infoblox' => [
'use_ranges',
],
'puppet' => [
'agent_template',
'main_template',
'server_app_root',
'server_ca_proxy',
'server_directory_environments',
'server_dynamic_environments',
'server_environments',
'server_http_allow',
'server_httpd_service',
'server_implementation',
'server_main_template',
'server_passenger',
'server_passenger_min_instances',
'server_passenger_pre_start',
'server_passenger_ruby',
'server_rack_arguments',
'server_service_fallback',
'server_template',
],
}.freeze

CLEAR = {
'foreman' => [
'authentication',
Expand All @@ -51,15 +10,6 @@
],
}.freeze

DELETED.each do |mod, parameters|
mod_answers = answers[mod]
next unless mod_answers.is_a?(Hash)

parameters.each do |parameter|
mod_answers.delete(parameter)
end
end

CLEAR.each do |mod, parameters|
mod_answers = answers[mod]
next unless mod_answers.is_a?(Hash)
Expand Down

0 comments on commit 071cd88

Please sign in to comment.