Remove defaults for parameters that have been removed

Author: ekohl

config/katello-answers.yaml

@@ -90,12 +90,8 @@ foreman_proxy::plugin::openscap: false
 foreman_proxy::plugin::remote_execution::ssh: false
 foreman_proxy::plugin::salt: false
 foreman_proxy::plugin::shellhooks: false
-foreman_proxy_content:
-  proxy_pulp_yum_to_pulpcore: true
-  proxy_pulp_deb_to_pulpcore: true
-katello:
-  use_pulp_2_for_yum: false
-  use_pulp_2_for_deb: false
+foreman_proxy_content: true
+katello: true
 puppet:
   server: true
   server_environments_owner: apache

config/katello.migrations/200605154320-dont-use-pulpcore-rpm-on-upgrades.rb

@@ -6,4 +6,4 @@ def upgrade
   answers[KATELLO][USE_PULP_2_FOR_YUM] = true
 end
 
-upgrade if answers[KATELLO] && answers[KATELLO][USE_PULP_2_FOR_YUM].nil?
+upgrade if answers[KATELLO].is_a?(Hash) && answers[KATELLO][USE_PULP_2_FOR_YUM].nil?

config/katello.migrations/200611220455-dont-proxy-pulp-yum-to-pulpcore-on-upgrades.rb

@@ -6,4 +6,4 @@ def upgrade
   answers[FPC][PROXY_YUM] = false
 end
 
-upgrade if answers[FPC] && answers[FPC][PROXY_YUM].nil?
+upgrade if answers[FPC].is_a?(Hash) && answers[FPC][PROXY_YUM].nil?