Fixes #31614: Enable Pulp 3 by default on server and proxies

config/foreman-proxy-content-answers.yaml

@@ -12,8 +12,7 @@
 certs:
   generate: false
 foreman_proxy_content:
-  proxy_pulp_isos_to_pulpcore: false
-  proxy_pulp_yum_to_pulpcore: false
+  pulpcore_mirror: true
 foreman_proxy:
   foreman_ssl_ca: /etc/foreman-proxy/foreman_ssl_ca.pem
   foreman_ssl_cert: /etc/foreman-proxy/foreman_ssl_cert.pem
@@ -31,9 +30,6 @@ foreman_proxy::plugin::dhcp::remote_isc: false
 foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::dns::infoblox: false
 foreman_proxy::plugin::openscap: false
-foreman_proxy::plugin::pulp:
-  enabled: false
-  pulpnode_enabled: true
 foreman_proxy::plugin::remote_execution::ssh: false
 puppet:
   server: true

config/foreman-proxy-content.migrations/210112194603-enable-pulp3-content-proxy.rb

@@ -0,0 +1,12 @@
+answers.delete('foreman_proxy::plugin::pulp')
+
+if answers['foreman_proxy_content'].is_a?(Hash)
+  answers['foreman_proxy_content']['pulpcore_mirror'] = true
+
+  # Prior migrations add these so we need to ensure they are deleted
+  # config/katello.migrations/200611220455-dont-proxy-pulp-yum-to-pulpcore-on-upgrades.rb
+  # config/katello.migrations/200123161606-enable-pulpcore.rb
+  # config/katello.migrations/202011084146-dont-proxy-pulp-deb-to-pulpcore-on-upgrades.rb
+  answers['foreman_proxy_content'].delete('proxy_pulp_isos_to_pulpcore')
+  answers['foreman_proxy_content'].delete('proxy_pulp_yum_to_pulpcore')
+end

config/katello-answers.yaml

@@ -84,8 +84,6 @@ foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::dns::infoblox: false
 foreman_proxy::plugin::monitoring: false
 foreman_proxy::plugin::openscap: false
-foreman_proxy::plugin::pulp:
-  pulpcore_enabled: true
 foreman_proxy::plugin::remote_execution::ssh: false
 foreman_proxy::plugin::salt: false
 foreman_proxy_content:

config/katello.migrations/210112194551-enable-pulp3-content-proxy.rb

@@ -0,0 +1 @@
+answers.delete('foreman_proxy::plugin::pulp')

hooks/boot/01-kafo-hook-extensions.rb

@@ -81,16 +81,8 @@ def candlepin_enabled?
     katello_enabled?
   end
 
-  def pulp_enabled?
-    module_enabled?('foreman_proxy_plugin_pulp') && (param_value('foreman_proxy_plugin_pulp', 'pulpnode_enabled') || param_value('foreman_proxy_plugin_pulp', 'enabled'))
-  end
-
-  def pulp_present?
-    module_present?('foreman_proxy_plugin_pulp')
-  end
-
   def pulpcore_enabled?
-    module_enabled?('foreman_proxy_plugin_pulp') && param_value('foreman_proxy_plugin_pulp', 'pulpcore_enabled')
+    module_enabled?('foreman_proxy_content')
   end
 
   def needs_postgresql_scl_upgrade?
@@ -155,22 +147,6 @@ def execute_command(command, do_say, do_log)
   def remote_host?(hostname)
     !['localhost', '127.0.0.1', `hostname`.strip].include?(hostname)
   end
-
-  def load_mongo_config
-    seeds = param_value('katello', 'pulp_db_seeds')
-    seed = seeds&.split(',')&.first
-    host, port = seed.split(':') if seed
-    {
-      host: host || 'localhost',
-      port: port || '27017',
-      database: param_value('katello', 'pulp_db_name') || 'pulp_database',
-      username: param_value('katello', 'pulp_db_username'),
-      password: param_value('katello', 'pulp_db_password'),
-      ssl: param_value('katello', 'pulp_db_ssl') || false,
-      ca_path: param_value('katello', 'pulp_db_ca_path'),
-      ssl_certfile: param_value('katello', 'pulp_db_ssl_certfile'),
-    }
-  end
 end
 
 Kafo::HookContext.send(:include, HookContextExtension)

hooks/pre/10-reset_data.rb

@@ -7,7 +7,6 @@ def reset
   start_services(['postgresql']) if local_postgresql?
   empty_db_in_postgresql('foreman') if foreman_server?
   reset_candlepin if candlepin_enabled?
-  reset_pulp if pulp_enabled?
   reset_pulpcore if pulpcore_enabled?
 end
 
@@ -57,33 +56,6 @@ def reset_candlepin
   empty_db_in_postgresql('candlepin')
 end
 
-def empty_mongo(config)
-  if config[:ssl]
-    ssl = '--ssl'
-    if config[:ca_path]
-      ca_cert = "--sslCAFile #{config[:ca_path]}"
-      client_cert = "--sslPEMKeyFile #{config[:ssl_certfile]}" if config[:ssl_certfile]
-    end
-  end
-  username = "-u #{config[:username]}" if config[:username]
-  password = "-p #{config[:password]}" if config[:password]
-  host = "--host #{config[:host]} --port #{config[:port]}"
-  cmd = "mongo #{config[:database]} #{username} #{password} #{host} #{ssl} #{ca_cert} #{client_cert} --eval 'db.dropDatabase();'"
-  execute!(cmd)
-end
-
-def reset_pulp
-  execute!('rm -f /var/lib/pulp/init.flag')
-
-  mongo_config = load_mongo_config
-  start_services(['rh-mongodb34-mongod']) unless remote_host?(mongo_config[:host])
-  logger.info 'Dropping Pulp database!'
-  empty_mongo(mongo_config)
-
-  logger.info 'Clearing Pulp content from disk.'
-  execute!('rm -rf /var/lib/pulp/{distributions,published,repos,content}/*')
-end
-
 def pg_command_base(config, command, args)
   "PGPASSWORD='#{config[:password]}' #{command} -U #{config[:username]} -h #{config[:host]} -p #{config[:port]} #{args}"
 end

hooks/pre/32-install_selinux_packages.rb

@@ -11,7 +11,6 @@
   packages << 'katello-selinux' if katello_enabled?
   packages << 'candlepin-selinux' if katello_enabled?
   packages << 'pulpcore-selinux' if pulpcore_enabled?
-  packages << 'crane-selinux' if pulp_enabled?
 
   ensure_packages(packages, 'installed')
 end

hooks/pre_commit/14-mongo-cache-size.rb

@@ -1,7 +1,7 @@
 # Setting Default Mongo WiredTiger Engine cache size to be 20% of total memory
 # See https://access.redhat.com/solutions/4505561
 # See https://docs.mongodb.com/manual/core/wiredtiger/#memory-use
-if pulp_enabled?
+if katello_enabled? || devel_scenario?
   MONGO_CACHE_SIZE_FACT = 'mongo_cache_size'.freeze
 
   current_mongo_cache_size = get_custom_fact(MONGO_CACHE_SIZE_FACT)

spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml

@@ -28,8 +28,6 @@ foreman_proxy::plugin::chef: false
 foreman_proxy::plugin::dhcp::remote_isc: false
 foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::monitoring: false
-foreman_proxy::plugin::pulp:
-  pulpcore_enabled: true
 foreman_proxy::plugin::salt: false
 foreman_proxy_content:
   proxy_pulp_deb_to_pulpcore: false

spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml

@@ -28,8 +28,6 @@ foreman_proxy::plugin::chef: false
 foreman_proxy::plugin::dhcp::remote_isc: false
 foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::monitoring: false
-foreman_proxy::plugin::pulp:
-  pulpcore_enabled: true
 foreman_proxy::plugin::salt: false
 foreman_proxy_content:
   proxy_pulp_isos_to_pulpcore: false

spec/fixtures/pulpcore-migration/katello-answers-after.yaml

@@ -28,8 +28,6 @@ foreman_proxy::plugin::chef: false
 foreman_proxy::plugin::dhcp::remote_isc: false
 foreman_proxy::plugin::discovery: false
 foreman_proxy::plugin::monitoring: false
-foreman_proxy::plugin::pulp:
-  pulpcore_enabled: true
 foreman_proxy::plugin::salt: false
 foreman_proxy_content:
   proxy_pulp_isos_to_pulpcore: false