diff --git a/bin/create-migration b/bin/create-migration
index afb6d3e9..d33da964 100755
--- a/bin/create-migration
+++ b/bin/create-migration
@@ -16,20 +16,8 @@ directories.each do |directory|
     exit 2
   end
 
-  if File.basename(directory) == 'foreman.migrations'
-    # Used by the foreman scenario
-    format = '+%Y%m%d%H%M%S'
-    to_replace = '-'
-    glue = '_'
-  else
-    # Recommended format by kafo
-    format = '+%y%m%d%H%M%S'
-    to_replace = '-'
-    glue = '-'
-  end
-
-  timestamp = `TZ=UTC date #{format}`.strip
-  filename = File.join(directory, "#{timestamp}#{glue}#{migration_name.gsub(to_replace, glue)}.rb")
+  timestamp = `TZ=UTC date '+%Y%m%d%H%M%S'`.strip
+  filename = File.join(directory, "#{timestamp}#{glue}#{migration_name.gsub('-', '_')}.rb")
 
   File.open(filename, 'w') do |file|
     file.puts(content) if content
diff --git a/config/foreman-proxy-content.migrations/170104152429-add-discovery.rb b/config/foreman-proxy-content.migrations/20170104152429_add_discovery.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/170104152429-add-discovery.rb
rename to config/foreman-proxy-content.migrations/20170104152429_add_discovery.rb
diff --git a/config/foreman-proxy-content.migrations/170109180612-dhcp_range_cant_be_false.rb b/config/foreman-proxy-content.migrations/20170109180612_dhcp_range_cant_be_false.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/170109180612-dhcp_range_cant_be_false.rb
rename to config/foreman-proxy-content.migrations/20170109180612_dhcp_range_cant_be_false.rb
diff --git a/config/foreman-proxy-content.migrations/180111142132-foreman_proxy_autosignfile.rb b/config/foreman-proxy-content.migrations/20180111142132_foreman_proxy_autosignfile.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/180111142132-foreman_proxy_autosignfile.rb
rename to config/foreman-proxy-content.migrations/20180111142132_foreman_proxy_autosignfile.rb
diff --git a/config/foreman-proxy-content.migrations/180702133937-set-puppet-integration-answer.rb b/config/foreman-proxy-content.migrations/20180702133937_set_puppet_integration_answer.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/180702133937-set-puppet-integration-answer.rb
rename to config/foreman-proxy-content.migrations/20180702133937_set_puppet_integration_answer.rb
diff --git a/config/foreman-proxy-content.migrations/180813131441-unmanage-puppet-group.rb b/config/foreman-proxy-content.migrations/20180813131441_unmanage_puppet_group.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/180813131441-unmanage-puppet-group.rb
rename to config/foreman-proxy-content.migrations/20180813131441_unmanage_puppet_group.rb
diff --git a/config/foreman-proxy-content.migrations/180829115142_change_rex_ssh_dir.rb b/config/foreman-proxy-content.migrations/20180829115142_change_rex_ssh_dir.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/180829115142_change_rex_ssh_dir.rb
rename to config/foreman-proxy-content.migrations/20180829115142_change_rex_ssh_dir.rb
diff --git a/config/foreman-proxy-content.migrations/180914180308-move-certs-tar-answer.rb b/config/foreman-proxy-content.migrations/20180914180308_move_certs_tar_answer.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/180914180308-move-certs-tar-answer.rb
rename to config/foreman-proxy-content.migrations/20180914180308_move_certs_tar_answer.rb
diff --git a/config/foreman-proxy-content.migrations/181012141418-qdrouterd-listen-ipv6.rb b/config/foreman-proxy-content.migrations/20181012141418_qdrouterd_listen_ipv6.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/181012141418-qdrouterd-listen-ipv6.rb
rename to config/foreman-proxy-content.migrations/20181012141418_qdrouterd_listen_ipv6.rb
diff --git a/config/foreman-proxy-content.migrations/181213211252-merged-installer.rb b/config/foreman-proxy-content.migrations/20181213211252_merged_installer.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/181213211252-merged-installer.rb
rename to config/foreman-proxy-content.migrations/20181213211252_merged_installer.rb
diff --git a/config/foreman-proxy-content.migrations/190111131058-reset-puppetserver-versions.rb b/config/foreman-proxy-content.migrations/20190111131058_reset_puppetserver_versions.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/190111131058-reset-puppetserver-versions.rb
rename to config/foreman-proxy-content.migrations/20190111131058_reset_puppetserver_versions.rb
diff --git a/config/foreman-proxy-content.migrations/190111180118-delete-removed-settings.rb b/config/foreman-proxy-content.migrations/20190111180118_delete_removed_settings.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/190111180118-delete-removed-settings.rb
rename to config/foreman-proxy-content.migrations/20190111180118_delete_removed_settings.rb
diff --git a/config/foreman-proxy-content.migrations/190312182008-remove-pulp-child-tasks.rb b/config/foreman-proxy-content.migrations/20190312182008_remove_pulp_child_tasks.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/190312182008-remove-pulp-child-tasks.rb
rename to config/foreman-proxy-content.migrations/20190312182008_remove_pulp_child_tasks.rb
diff --git a/config/foreman-proxy-content.migrations/190318130000-migrate-hiera-config.rb b/config/foreman-proxy-content.migrations/20190318130000_migrate_hiera_config.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/190318130000-migrate-hiera-config.rb
rename to config/foreman-proxy-content.migrations/20190318130000_migrate_hiera_config.rb
diff --git a/config/foreman-proxy-content.migrations/190626145114-add-smart-proxy-remote-isc-plugin.rb b/config/foreman-proxy-content.migrations/20190626145114_add_smart_proxy_remote_isc_plugin.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/190626145114-add-smart-proxy-remote-isc-plugin.rb
rename to config/foreman-proxy-content.migrations/20190626145114_add_smart_proxy_remote_isc_plugin.rb
diff --git a/config/foreman-proxy-content.migrations/190710195757-force_no_prefix_false.rb b/config/foreman-proxy-content.migrations/20190710195757_force_no_prefix_false.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/190710195757-force_no_prefix_false.rb
rename to config/foreman-proxy-content.migrations/20190710195757_force_no_prefix_false.rb
diff --git a/config/foreman-proxy-content.migrations/191122200809-drop-pulp-master-param.rb b/config/foreman-proxy-content.migrations/20191122200809_drop_pulp_master_param.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/191122200809-drop-pulp-master-param.rb
rename to config/foreman-proxy-content.migrations/20191122200809_drop_pulp_master_param.rb
diff --git a/config/foreman-proxy-content.migrations/191218160614-update-hook-dirs.rb b/config/foreman-proxy-content.migrations/20191218160614_update_hook_dirs.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/191218160614-update-hook-dirs.rb
rename to config/foreman-proxy-content.migrations/20191218160614_update_hook_dirs.rb
diff --git a/config/foreman-proxy-content.migrations/200113133837-reset-bind-host-foreman-proxy.rb b/config/foreman-proxy-content.migrations/20200113133837_reset_bind_host_foreman_proxy.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/200113133837-reset-bind-host-foreman-proxy.rb
rename to config/foreman-proxy-content.migrations/20200113133837_reset_bind_host_foreman_proxy.rb
diff --git a/config/foreman-proxy-content.migrations/200616155948-disable-pulp-3-proxying.rb b/config/foreman-proxy-content.migrations/20200616155948_disable_pulp_3_proxying.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/200616155948-disable-pulp-3-proxying.rb
rename to config/foreman-proxy-content.migrations/20200616155948_disable_pulp_3_proxying.rb
diff --git a/config/foreman-proxy-content.migrations/200630000120-disable-pulp-2-el8.rb b/config/foreman-proxy-content.migrations/20200630000120_disable_pulp_2_el8.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/200630000120-disable-pulp-2-el8.rb
rename to config/foreman-proxy-content.migrations/20200630000120_disable_pulp_2_el8.rb
diff --git a/config/foreman-proxy-content.migrations/200818160950-remove_tuning_fact.rb b/config/foreman-proxy-content.migrations/20200818160950_remove_tuning_fact.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/200818160950-remove_tuning_fact.rb
rename to config/foreman-proxy-content.migrations/20200818160950_remove_tuning_fact.rb
diff --git a/config/foreman-proxy-content.migrations/201217175955-stricter-ciphers.rb b/config/foreman-proxy-content.migrations/20201217175955_stricter_ciphers.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/201217175955-stricter-ciphers.rb
rename to config/foreman-proxy-content.migrations/20201217175955_stricter_ciphers.rb
diff --git a/config/foreman-proxy-content.migrations/20201014164531_verbose_by-default.rb b/config/foreman-proxy-content.migrations/2020201014164531_verbose_by_default.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/20201014164531_verbose_by-default.rb
rename to config/foreman-proxy-content.migrations/2020201014164531_verbose_by_default.rb
diff --git a/config/foreman-proxy-content.migrations/20201224125100_ansible_ssh_args.rb b/config/foreman-proxy-content.migrations/2020201224125100_ansible_ssh_args.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/20201224125100_ansible_ssh_args.rb
rename to config/foreman-proxy-content.migrations/2020201224125100_ansible_ssh_args.rb
diff --git a/config/foreman-proxy-content.migrations/20210304102446_add_proxy_shellhooks_plugin.rb b/config/foreman-proxy-content.migrations/2020210304102446_add_proxy_shellhooks_plugin.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/20210304102446_add_proxy_shellhooks_plugin.rb
rename to config/foreman-proxy-content.migrations/2020210304102446_add_proxy_shellhooks_plugin.rb
diff --git a/config/foreman-proxy-content.migrations/20210729084840-add-proxy-acd-plugin.rb b/config/foreman-proxy-content.migrations/2020210729084840_add_proxy_acd_plugin.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/20210729084840-add-proxy-acd-plugin.rb
rename to config/foreman-proxy-content.migrations/2020210729084840_add_proxy_acd_plugin.rb
diff --git a/config/foreman-proxy-content.migrations/210112194603-enable-pulp3-content-proxy.rb b/config/foreman-proxy-content.migrations/20210112194603_enable_pulp3_content_proxy.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/210112194603-enable-pulp3-content-proxy.rb
rename to config/foreman-proxy-content.migrations/20210112194603_enable_pulp3_content_proxy.rb
diff --git a/config/foreman-proxy-content.migrations/210331121715-clear-puppetserver-nil-metrics.rb b/config/foreman-proxy-content.migrations/20210331121715_clear_puppetserver_nil_metrics.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/210331121715-clear-puppetserver-nil-metrics.rb
rename to config/foreman-proxy-content.migrations/20210331121715_clear_puppetserver_nil_metrics.rb
diff --git a/config/foreman-proxy-content.migrations/210407174237-add-puppet-reserved-code-cache.rb b/config/foreman-proxy-content.migrations/20210407174237_add_puppet_reserved_code_cache.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/210407174237-add-puppet-reserved-code-cache.rb
rename to config/foreman-proxy-content.migrations/20210407174237_add_puppet_reserved_code_cache.rb
diff --git a/config/foreman-proxy-content.migrations/210415180240-enable-katello-agent.rb b/config/foreman-proxy-content.migrations/20210415180240_enable_katello_agent.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/210415180240-enable-katello-agent.rb
rename to config/foreman-proxy-content.migrations/20210415180240_enable_katello_agent.rb
diff --git a/config/foreman-proxy-content.migrations/210726184347-clear-puppet-server-ssl-chain-filepath.rb b/config/foreman-proxy-content.migrations/20210726184347_clear_puppet_server_ssl_chain_filepath.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/210726184347-clear-puppet-server-ssl-chain-filepath.rb
rename to config/foreman-proxy-content.migrations/20210726184347_clear_puppet_server_ssl_chain_filepath.rb
diff --git a/config/foreman-proxy-content.migrations/210802145222-reset-foreman-proxy-httpboot-undef.rb b/config/foreman-proxy-content.migrations/20210802145222_reset_foreman_proxy_httpboot_undef.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/210802145222-reset-foreman-proxy-httpboot-undef.rb
rename to config/foreman-proxy-content.migrations/20210802145222_reset_foreman_proxy_httpboot_undef.rb
diff --git a/config/foreman-proxy-content.migrations/211020223805-add-proxy-host-reports.rb b/config/foreman-proxy-content.migrations/20211020223805_add_proxy_host_reports.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/211020223805-add-proxy-host-reports.rb
rename to config/foreman-proxy-content.migrations/20211020223805_add_proxy_host_reports.rb
diff --git a/config/foreman-proxy-content.migrations/211108174119-disable-registration-without-templates.rb b/config/foreman-proxy-content.migrations/20211108174119_disable_registration_without_templates.rb
similarity index 100%
rename from config/foreman-proxy-content.migrations/211108174119-disable-registration-without-templates.rb
rename to config/foreman-proxy-content.migrations/20211108174119_disable_registration_without_templates.rb
diff --git a/config/foreman.migrations/20181113150224-add-cli-plugins.rb b/config/foreman.migrations/20181113150224_add_cli_plugins.rb
similarity index 100%
rename from config/foreman.migrations/20181113150224-add-cli-plugins.rb
rename to config/foreman.migrations/20181113150224_add_cli_plugins.rb
diff --git a/config/foreman.migrations/20190423154755_remove-docker-abrt-plugins.rb b/config/foreman.migrations/20190423154755_remove_docker_abrt_plugins.rb
similarity index 100%
rename from config/foreman.migrations/20190423154755_remove-docker-abrt-plugins.rb
rename to config/foreman.migrations/20190423154755_remove_docker_abrt_plugins.rb
diff --git a/config/foreman.migrations/20190903120000_remove-cockpit-plugin.rb b/config/foreman.migrations/20190903120000_remove_cockpit_plugin.rb
similarity index 100%
rename from config/foreman.migrations/20190903120000_remove-cockpit-plugin.rb
rename to config/foreman.migrations/20190903120000_remove_cockpit_plugin.rb
diff --git a/config/foreman.migrations/20191029130301_add_rex-cockpit.rb b/config/foreman.migrations/20191029130301_add_rex_cockpit.rb
similarity index 100%
rename from config/foreman.migrations/20191029130301_add_rex-cockpit.rb
rename to config/foreman.migrations/20191029130301_add_rex_cockpit.rb
diff --git a/config/foreman.migrations/20200113133837_reset_bind-host-foreman-proxy.rb b/config/foreman.migrations/20200113133837_reset_bind_host_foreman_proxy.rb
similarity index 100%
rename from config/foreman.migrations/20200113133837_reset_bind-host-foreman-proxy.rb
rename to config/foreman.migrations/20200113133837_reset_bind_host_foreman_proxy.rb
diff --git a/config/foreman.migrations/20200803163936_add_statistics-plugin.rb b/config/foreman.migrations/20200803163936_add_statistics_plugin.rb
similarity index 100%
rename from config/foreman.migrations/20200803163936_add_statistics-plugin.rb
rename to config/foreman.migrations/20200803163936_add_statistics_plugin.rb
diff --git a/config/foreman.migrations/20200803185054_add_column-view-plugin.rb b/config/foreman.migrations/20200803185054_add_column_view_plugin.rb
similarity index 100%
rename from config/foreman.migrations/20200803185054_add_column-view-plugin.rb
rename to config/foreman.migrations/20200803185054_add_column_view_plugin.rb
diff --git a/config/foreman.migrations/20201014164531_verbose_by-default.rb b/config/foreman.migrations/20201014164531_verbose_by_default.rb
similarity index 100%
rename from config/foreman.migrations/20201014164531_verbose_by-default.rb
rename to config/foreman.migrations/20201014164531_verbose_by_default.rb
diff --git a/config/foreman.migrations/20201207225700_remove_digitalocean-plugin.rb b/config/foreman.migrations/20201207225700_remove_digitalocean_plugin.rb
similarity index 100%
rename from config/foreman.migrations/20201207225700_remove_digitalocean-plugin.rb
rename to config/foreman.migrations/20201207225700_remove_digitalocean_plugin.rb
diff --git a/config/foreman.migrations/20210323145821_foreman_tasks-backup.rb b/config/foreman.migrations/20210323145821_foreman_tasks_backup.rb
similarity index 100%
rename from config/foreman.migrations/20210323145821_foreman_tasks-backup.rb
rename to config/foreman.migrations/20210323145821_foreman_tasks_backup.rb
diff --git a/config/foreman.migrations/20210331121715_clear_puppetserver-nil-metrics.rb b/config/foreman.migrations/20210331121715_clear_puppetserver_nil_metrics.rb
similarity index 100%
rename from config/foreman.migrations/20210331121715_clear_puppetserver-nil-metrics.rb
rename to config/foreman.migrations/20210331121715_clear_puppetserver_nil_metrics.rb
diff --git a/config/katello.migrations/170104152429-add-discovery.rb b/config/katello.migrations/20170104152429_add_discovery.rb
similarity index 100%
rename from config/katello.migrations/170104152429-add-discovery.rb
rename to config/katello.migrations/20170104152429_add_discovery.rb
diff --git a/config/katello.migrations/170109180612-dhcp_range_cant_be_false.rb b/config/katello.migrations/20170109180612_dhcp_range_cant_be_false.rb
similarity index 100%
rename from config/katello.migrations/170109180612-dhcp_range_cant_be_false.rb
rename to config/katello.migrations/20170109180612_dhcp_range_cant_be_false.rb
diff --git a/config/katello.migrations/170317102429-add-compute-resources.rb b/config/katello.migrations/20170317102429_add_compute_resources.rb
similarity index 100%
rename from config/katello.migrations/170317102429-add-compute-resources.rb
rename to config/katello.migrations/20170317102429_add_compute_resources.rb
diff --git a/config/katello.migrations/170331152302-add-cli.rb b/config/katello.migrations/20170331152302_add_cli.rb
similarity index 100%
rename from config/katello.migrations/170331152302-add-cli.rb
rename to config/katello.migrations/20170331152302_add_cli.rb
diff --git a/config/katello.migrations/171005163313-empty-proxy-strings.rb b/config/katello.migrations/20171005163313_empty_proxy_strings.rb
similarity index 100%
rename from config/katello.migrations/171005163313-empty-proxy-strings.rb
rename to config/katello.migrations/20171005163313_empty_proxy_strings.rb
diff --git a/config/katello.migrations/171026094113-rename-cp-oauth.rb b/config/katello.migrations/20171026094113_rename_cp_oauth.rb
similarity index 100%
rename from config/katello.migrations/171026094113-rename-cp-oauth.rb
rename to config/katello.migrations/20171026094113_rename_cp_oauth.rb
diff --git a/config/katello.migrations/171030102239-add-chef-proxy-plugin.rb b/config/katello.migrations/20171030102239_add_chef_proxy_plugin.rb
similarity index 100%
rename from config/katello.migrations/171030102239-add-chef-proxy-plugin.rb
rename to config/katello.migrations/20171030102239_add_chef_proxy_plugin.rb
diff --git a/config/katello.migrations/180111142132-foreman_proxy_autosignfile.rb b/config/katello.migrations/20180111142132_foreman_proxy_autosignfile.rb
similarity index 100%
rename from config/katello.migrations/180111142132-foreman_proxy_autosignfile.rb
rename to config/katello.migrations/20180111142132_foreman_proxy_autosignfile.rb
diff --git a/config/katello.migrations/180702133937-set-puppet-integration-answer.rb b/config/katello.migrations/20180702133937_set_puppet_integration_answer.rb
similarity index 100%
rename from config/katello.migrations/180702133937-set-puppet-integration-answer.rb
rename to config/katello.migrations/20180702133937_set_puppet_integration_answer.rb
diff --git a/config/katello.migrations/180813131441-unmanage-puppet-group.rb b/config/katello.migrations/20180813131441_unmanage_puppet_group.rb
similarity index 100%
rename from config/katello.migrations/180813131441-unmanage-puppet-group.rb
rename to config/katello.migrations/20180813131441_unmanage_puppet_group.rb
diff --git a/config/katello.migrations/180822160737-foreman_jobs_service.rb b/config/katello.migrations/20180822160737_foreman_jobs_service.rb
similarity index 100%
rename from config/katello.migrations/180822160737-foreman_jobs_service.rb
rename to config/katello.migrations/20180822160737_foreman_jobs_service.rb
diff --git a/config/katello.migrations/180829115142_change_rex_ssh_dir.rb b/config/katello.migrations/20180829115142_change_rex_ssh_dir.rb
similarity index 100%
rename from config/katello.migrations/180829115142_change_rex_ssh_dir.rb
rename to config/katello.migrations/20180829115142_change_rex_ssh_dir.rb
diff --git a/config/katello.migrations/180914180308-move-certs-tar-answer.rb b/config/katello.migrations/20180914180308_move_certs_tar_answer.rb
similarity index 100%
rename from config/katello.migrations/180914180308-move-certs-tar-answer.rb
rename to config/katello.migrations/20180914180308_move_certs_tar_answer.rb
diff --git a/config/katello.migrations/181012141418-qdrouterd-listen-ipv6.rb b/config/katello.migrations/20181012141418_qdrouterd_listen_ipv6.rb
similarity index 100%
rename from config/katello.migrations/181012141418-qdrouterd-listen-ipv6.rb
rename to config/katello.migrations/20181012141418_qdrouterd_listen_ipv6.rb
diff --git a/config/katello.migrations/181213211252-merged-installer.rb b/config/katello.migrations/20181213211252_merged_installer.rb
similarity index 100%
rename from config/katello.migrations/181213211252-merged-installer.rb
rename to config/katello.migrations/20181213211252_merged_installer.rb
diff --git a/config/katello.migrations/190111131058-reset-puppetserver-versions.rb b/config/katello.migrations/20190111131058_reset_puppetserver_versions.rb
similarity index 100%
rename from config/katello.migrations/190111131058-reset-puppetserver-versions.rb
rename to config/katello.migrations/20190111131058_reset_puppetserver_versions.rb
diff --git a/config/katello.migrations/190111180118-delete-removed-settings.rb b/config/katello.migrations/20190111180118_delete_removed_settings.rb
similarity index 100%
rename from config/katello.migrations/190111180118-delete-removed-settings.rb
rename to config/katello.migrations/20190111180118_delete_removed_settings.rb
diff --git a/config/katello.migrations/190210184918-add-plugins.rb b/config/katello.migrations/20190210184918_add_plugins.rb
similarity index 100%
rename from config/katello.migrations/190210184918-add-plugins.rb
rename to config/katello.migrations/20190210184918_add_plugins.rb
diff --git a/config/katello.migrations/190312182039-remove-pulp-child-tasks.rb b/config/katello.migrations/20190312182039_remove_pulp_child_tasks.rb
similarity index 100%
rename from config/katello.migrations/190312182039-remove-pulp-child-tasks.rb
rename to config/katello.migrations/20190312182039_remove_pulp_child_tasks.rb
diff --git a/config/katello.migrations/190318130000-migrate-hiera-config.rb b/config/katello.migrations/20190318130000_migrate_hiera_config.rb
similarity index 100%
rename from config/katello.migrations/190318130000-migrate-hiera-config.rb
rename to config/katello.migrations/20190318130000_migrate_hiera_config.rb
diff --git a/config/katello.migrations/190406203844-add-expire-hosts.rb b/config/katello.migrations/20190406203844_add_expire_hosts.rb
similarity index 100%
rename from config/katello.migrations/190406203844-add-expire-hosts.rb
rename to config/katello.migrations/20190406203844_add_expire_hosts.rb
diff --git a/config/katello.migrations/190412103750-add-salt-plugin.rb b/config/katello.migrations/20190412103750_add_salt_plugin.rb
similarity index 100%
rename from config/katello.migrations/190412103750-add-salt-plugin.rb
rename to config/katello.migrations/20190412103750_add_salt_plugin.rb
diff --git a/config/katello.migrations/190416054903-foreman_snapshot_management.rb b/config/katello.migrations/20190416054903_foreman_snapshot_management.rb
similarity index 100%
rename from config/katello.migrations/190416054903-foreman_snapshot_management.rb
rename to config/katello.migrations/20190416054903_foreman_snapshot_management.rb
diff --git a/config/katello.migrations/190506151413-add-hammer-cli-ansible.rb b/config/katello.migrations/20190506151413_add_hammer_cli_ansible.rb
similarity index 100%
rename from config/katello.migrations/190506151413-add-hammer-cli-ansible.rb
rename to config/katello.migrations/20190506151413_add_hammer_cli_ansible.rb
diff --git a/config/katello.migrations/190522134215-katello_kubevirt.rb b/config/katello.migrations/20190522134215_katello_kubevirt.rb
similarity index 100%
rename from config/katello.migrations/190522134215-katello_kubevirt.rb
rename to config/katello.migrations/20190522134215_katello_kubevirt.rb
diff --git a/config/katello.migrations/190626145114-add-smart-proxy-remote-isc-plugin.rb b/config/katello.migrations/20190626145114_add_smart_proxy_remote_isc_plugin.rb
similarity index 100%
rename from config/katello.migrations/190626145114-add-smart-proxy-remote-isc-plugin.rb
rename to config/katello.migrations/20190626145114_add_smart_proxy_remote_isc_plugin.rb
diff --git a/config/katello.migrations/190710133444-add-virt-who.rb b/config/katello.migrations/20190710133444_add_virt_who.rb
similarity index 100%
rename from config/katello.migrations/190710133444-add-virt-who.rb
rename to config/katello.migrations/20190710133444_add_virt_who.rb
diff --git a/config/katello.migrations/190821132544-add-inventory-upload.rb b/config/katello.migrations/20190821132544_add_inventory_upload.rb
similarity index 100%
rename from config/katello.migrations/190821132544-add-inventory-upload.rb
rename to config/katello.migrations/20190821132544_add_inventory_upload.rb
diff --git a/config/katello.migrations/190904144224-set_tuning_fact.rb b/config/katello.migrations/20190904144224_set_tuning_fact.rb
similarity index 100%
rename from config/katello.migrations/190904144224-set_tuning_fact.rb
rename to config/katello.migrations/20190904144224_set_tuning_fact.rb
diff --git a/config/katello.migrations/191029130301-add-rex-cockpit.rb b/config/katello.migrations/20191029130301_add_rex_cockpit.rb
similarity index 100%
rename from config/katello.migrations/191029130301-add-rex-cockpit.rb
rename to config/katello.migrations/20191029130301_add_rex_cockpit.rb
diff --git a/config/katello.migrations/191121130711-hammer_cli_azure.rb b/config/katello.migrations/20191121130711_hammer_cli_azure.rb
similarity index 100%
rename from config/katello.migrations/191121130711-hammer_cli_azure.rb
rename to config/katello.migrations/20191121130711_hammer_cli_azure.rb
diff --git a/config/katello.migrations/191122200809-drop-pulp-master-param.rb b/config/katello.migrations/20191122200809_drop_pulp_master_param.rb
similarity index 100%
rename from config/katello.migrations/191122200809-drop-pulp-master-param.rb
rename to config/katello.migrations/20191122200809_drop_pulp_master_param.rb
diff --git a/config/katello.migrations/191202071825-foreman_azure.rb b/config/katello.migrations/20191202071825_foreman_azure.rb
similarity index 100%
rename from config/katello.migrations/191202071825-foreman_azure.rb
rename to config/katello.migrations/20191202071825_foreman_azure.rb
diff --git a/config/katello.migrations/191209155854-drop-repo-params.rb b/config/katello.migrations/20191209155854_drop_repo_params.rb
similarity index 100%
rename from config/katello.migrations/191209155854-drop-repo-params.rb
rename to config/katello.migrations/20191209155854_drop_repo_params.rb
diff --git a/config/katello.migrations/191218160614-update-hook-dirs.rb b/config/katello.migrations/20191218160614_update_hook_dirs.rb
similarity index 100%
rename from config/katello.migrations/191218160614-update-hook-dirs.rb
rename to config/katello.migrations/20191218160614_update_hook_dirs.rb
diff --git a/config/katello.migrations/200113133837-reset-bind-host-foreman-proxy.rb b/config/katello.migrations/20200113133837_reset_bind_host_foreman_proxy.rb
similarity index 100%
rename from config/katello.migrations/200113133837-reset-bind-host-foreman-proxy.rb
rename to config/katello.migrations/20200113133837_reset_bind_host_foreman_proxy.rb
diff --git a/config/katello.migrations/200123161606-enable-pulpcore.rb b/config/katello.migrations/20200123161606_enable_pulpcore.rb
similarity index 100%
rename from config/katello.migrations/200123161606-enable-pulpcore.rb
rename to config/katello.migrations/20200123161606_enable_pulpcore.rb
diff --git a/config/katello.migrations/200306192827-enable_puma.rb b/config/katello.migrations/20200306192827_enable_puma.rb
similarity index 100%
rename from config/katello.migrations/200306192827-enable_puma.rb
rename to config/katello.migrations/20200306192827_enable_puma.rb
diff --git a/config/katello.migrations/200402093739-rename-inventory_upload-to-rh_cloud.rb b/config/katello.migrations/20200402093739_rename_inventory_upload_to_rh_cloud.rb
similarity index 100%
rename from config/katello.migrations/200402093739-rename-inventory_upload-to-rh_cloud.rb
rename to config/katello.migrations/20200402093739_rename_inventory_upload_to_rh_cloud.rb
diff --git a/config/katello.migrations/200504134326-add-foreman-leapp.rb b/config/katello.migrations/20200504134326_add_foreman_leapp.rb
similarity index 100%
rename from config/katello.migrations/200504134326-add-foreman-leapp.rb
rename to config/katello.migrations/20200504134326_add_foreman_leapp.rb
diff --git a/config/katello.migrations/200605154320-dont-use-pulpcore-rpm-on-upgrades.rb b/config/katello.migrations/20200605154320_dont_use_pulpcore_rpm_on_upgrades.rb
similarity index 100%
rename from config/katello.migrations/200605154320-dont-use-pulpcore-rpm-on-upgrades.rb
rename to config/katello.migrations/20200605154320_dont_use_pulpcore_rpm_on_upgrades.rb
diff --git a/config/katello.migrations/200611220455-dont-proxy-pulp-yum-to-pulpcore-on-upgrades.rb b/config/katello.migrations/20200611220455_dont_proxy_pulp_yum_to_pulpcore_on_upgrades.rb
similarity index 100%
rename from config/katello.migrations/200611220455-dont-proxy-pulp-yum-to-pulpcore-on-upgrades.rb
rename to config/katello.migrations/20200611220455_dont_proxy_pulp_yum_to_pulpcore_on_upgrades.rb
diff --git a/config/katello.migrations/200630000120-disable-pulp-2-el8.rb b/config/katello.migrations/20200630000120_disable_pulp_2_el8.rb
similarity index 100%
rename from config/katello.migrations/200630000120-disable-pulp-2-el8.rb
rename to config/katello.migrations/20200630000120_disable_pulp_2_el8.rb
diff --git a/config/katello.migrations/200803163936-add-statistics-plugin.rb b/config/katello.migrations/20200803163936_add_statistics_plugin.rb
similarity index 100%
rename from config/katello.migrations/200803163936-add-statistics-plugin.rb
rename to config/katello.migrations/20200803163936_add_statistics_plugin.rb
diff --git a/config/katello.migrations/200803185054-add-column-view-plugin.rb b/config/katello.migrations/20200803185054_add_column_view_plugin.rb
similarity index 100%
rename from config/katello.migrations/200803185054-add-column-view-plugin.rb
rename to config/katello.migrations/20200803185054_add_column_view_plugin.rb
diff --git a/config/katello.migrations/200806075006-change-logging-layout.rb b/config/katello.migrations/20200806075006_change_logging_layout.rb
similarity index 100%
rename from config/katello.migrations/200806075006-change-logging-layout.rb
rename to config/katello.migrations/20200806075006_change_logging_layout.rb
diff --git a/config/katello.migrations/201020000340-drop-rackspace.rb b/config/katello.migrations/20201020000340_drop_rackspace.rb
similarity index 100%
rename from config/katello.migrations/201020000340-drop-rackspace.rb
rename to config/katello.migrations/20201020000340_drop_rackspace.rb
diff --git a/config/katello.migrations/201207230019-remove-digitalocean-plugin.rb b/config/katello.migrations/20201207230019_remove_digitalocean_plugin.rb
similarity index 100%
rename from config/katello.migrations/201207230019-remove-digitalocean-plugin.rb
rename to config/katello.migrations/20201207230019_remove_digitalocean_plugin.rb
diff --git a/config/katello.migrations/201216152253-enable-remote-execution.rb b/config/katello.migrations/20201216152253_enable_remote_execution.rb
similarity index 100%
rename from config/katello.migrations/201216152253-enable-remote-execution.rb
rename to config/katello.migrations/20201216152253_enable_remote_execution.rb
diff --git a/config/katello.migrations/201217175955-stricter-ciphers.rb b/config/katello.migrations/20201217175955_stricter_ciphers.rb
similarity index 100%
rename from config/katello.migrations/201217175955-stricter-ciphers.rb
rename to config/katello.migrations/20201217175955_stricter_ciphers.rb
diff --git a/config/katello.migrations/20201014164531_verbose_by-default.rb b/config/katello.migrations/2020201014164531_verbose_by_default.rb
similarity index 100%
rename from config/katello.migrations/20201014164531_verbose_by-default.rb
rename to config/katello.migrations/2020201014164531_verbose_by_default.rb
diff --git a/config/katello.migrations/202011084145-dont-user-pulpcore-deb-on-upgrades.rb b/config/katello.migrations/20202011084145_dont_user_pulpcore_deb_on_upgrades.rb
similarity index 100%
rename from config/katello.migrations/202011084145-dont-user-pulpcore-deb-on-upgrades.rb
rename to config/katello.migrations/20202011084145_dont_user_pulpcore_deb_on_upgrades.rb
diff --git a/config/katello.migrations/202011084146-dont-proxy-pulp-deb-to-pulpcore-on-upgrades.rb b/config/katello.migrations/20202011084146_dont_proxy_pulp_deb_to_pulpcore_on_upgrades.rb
similarity index 100%
rename from config/katello.migrations/202011084146-dont-proxy-pulp-deb-to-pulpcore-on-upgrades.rb
rename to config/katello.migrations/20202011084146_dont_proxy_pulp_deb_to_pulpcore_on_upgrades.rb
diff --git a/config/katello.migrations/20201224125100_ansible_ssh_args.rb b/config/katello.migrations/2020201224125100_ansible_ssh_args.rb
similarity index 100%
rename from config/katello.migrations/20201224125100_ansible_ssh_args.rb
rename to config/katello.migrations/2020201224125100_ansible_ssh_args.rb
diff --git a/config/katello.migrations/20210304102210_add_webhooks_plugin.rb b/config/katello.migrations/2020210304102210_add_webhooks_plugin.rb
similarity index 100%
rename from config/katello.migrations/20210304102210_add_webhooks_plugin.rb
rename to config/katello.migrations/2020210304102210_add_webhooks_plugin.rb
diff --git a/config/katello.migrations/20210304102446_add_proxy_shellhooks_plugin.rb b/config/katello.migrations/2020210304102446_add_proxy_shellhooks_plugin.rb
similarity index 100%
rename from config/katello.migrations/20210304102446_add_proxy_shellhooks_plugin.rb
rename to config/katello.migrations/2020210304102446_add_proxy_shellhooks_plugin.rb
diff --git a/config/katello.migrations/20210729084840_add_acd_plugin.rb b/config/katello.migrations/2020210729084840_add_acd_plugin.rb
similarity index 100%
rename from config/katello.migrations/20210729084840_add_acd_plugin.rb
rename to config/katello.migrations/2020210729084840_add_acd_plugin.rb
diff --git a/config/katello.migrations/20210803130619-add-hammer-puppet-plugin.rb b/config/katello.migrations/2020210803130619_add_hammer_puppet_plugin.rb
similarity index 100%
rename from config/katello.migrations/20210803130619-add-hammer-puppet-plugin.rb
rename to config/katello.migrations/2020210803130619_add_hammer_puppet_plugin.rb
diff --git a/config/katello.migrations/210112194551-enable-pulp3-content-proxy.rb b/config/katello.migrations/20210112194551_enable_pulp3_content_proxy.rb
similarity index 100%
rename from config/katello.migrations/210112194551-enable-pulp3-content-proxy.rb
rename to config/katello.migrations/20210112194551_enable_pulp3_content_proxy.rb
diff --git a/config/katello.migrations/210323145816-foreman-tasks-backup.rb b/config/katello.migrations/20210323145816_foreman_tasks_backup.rb
similarity index 100%
rename from config/katello.migrations/210323145816-foreman-tasks-backup.rb
rename to config/katello.migrations/20210323145816_foreman_tasks_backup.rb
diff --git a/config/katello.migrations/210331121715-clear-puppetserver-nil-metrics.rb b/config/katello.migrations/20210331121715_clear_puppetserver_nil_metrics.rb
similarity index 100%
rename from config/katello.migrations/210331121715-clear-puppetserver-nil-metrics.rb
rename to config/katello.migrations/20210331121715_clear_puppetserver_nil_metrics.rb
diff --git a/config/katello.migrations/210407174237-add-puppet-reserved-code-cache.rb b/config/katello.migrations/20210407174237_add_puppet_reserved_code_cache.rb
similarity index 100%
rename from config/katello.migrations/210407174237-add-puppet-reserved-code-cache.rb
rename to config/katello.migrations/20210407174237_add_puppet_reserved_code_cache.rb
diff --git a/config/katello.migrations/210408173045-add-foreman-cli-katello.rb b/config/katello.migrations/20210408173045_add_foreman_cli_katello.rb
similarity index 100%
rename from config/katello.migrations/210408173045-add-foreman-cli-katello.rb
rename to config/katello.migrations/20210408173045_add_foreman_cli_katello.rb
diff --git a/config/katello.migrations/210415175000-enable-katello-agent.rb b/config/katello.migrations/20210415175000_enable_katello_agent.rb
similarity index 100%
rename from config/katello.migrations/210415175000-enable-katello-agent.rb
rename to config/katello.migrations/20210415175000_enable_katello_agent.rb
diff --git a/config/katello.migrations/210625142712-dynamic-puppet-in-foreman-groups.rb b/config/katello.migrations/20210625142712_dynamic_puppet_in_foreman_groups.rb
similarity index 100%
rename from config/katello.migrations/210625142712-dynamic-puppet-in-foreman-groups.rb
rename to config/katello.migrations/20210625142712_dynamic_puppet_in_foreman_groups.rb
diff --git a/config/katello.migrations/210708144422-add-foreman-puppet.rb b/config/katello.migrations/20210708144422_add_foreman_puppet.rb
similarity index 100%
rename from config/katello.migrations/210708144422-add-foreman-puppet.rb
rename to config/katello.migrations/20210708144422_add_foreman_puppet.rb
diff --git a/config/katello.migrations/210723145429-add-webhooks-cli.rb b/config/katello.migrations/20210723145429_add_webhooks_cli.rb
similarity index 100%
rename from config/katello.migrations/210723145429-add-webhooks-cli.rb
rename to config/katello.migrations/20210723145429_add_webhooks_cli.rb
diff --git a/config/katello.migrations/210726184347-clear-puppet-server-ssl-chain-filepath.rb b/config/katello.migrations/20210726184347_clear_puppet_server_ssl_chain_filepath.rb
similarity index 100%
rename from config/katello.migrations/210726184347-clear-puppet-server-ssl-chain-filepath.rb
rename to config/katello.migrations/20210726184347_clear_puppet_server_ssl_chain_filepath.rb
diff --git a/config/katello.migrations/210802145222-reset-foreman-proxy-httpboot-undef.rb b/config/katello.migrations/20210802145222_reset_foreman_proxy_httpboot_undef.rb
similarity index 100%
rename from config/katello.migrations/210802145222-reset-foreman-proxy-httpboot-undef.rb
rename to config/katello.migrations/20210802145222_reset_foreman_proxy_httpboot_undef.rb
diff --git a/config/katello.migrations/210809133829-reset-puma-min-threads.rb b/config/katello.migrations/20210809133829_reset_puma_min_threads.rb
similarity index 100%
rename from config/katello.migrations/210809133829-reset-puma-min-threads.rb
rename to config/katello.migrations/20210809133829_reset_puma_min_threads.rb
diff --git a/config/katello.migrations/210819164117-reset-puma-workers-and-max-threads.rb b/config/katello.migrations/20210819164117_reset_puma_workers_and_max_threads.rb
similarity index 100%
rename from config/katello.migrations/210819164117-reset-puma-workers-and-max-threads.rb
rename to config/katello.migrations/20210819164117_reset_puma_workers_and_max_threads.rb
diff --git a/config/katello.migrations/210929144850-disable-puppet-plugins-if-undesired.rb b/config/katello.migrations/20210929144850_disable_puppet_plugins_if_undesired.rb
similarity index 100%
rename from config/katello.migrations/210929144850-disable-puppet-plugins-if-undesired.rb
rename to config/katello.migrations/20210929144850_disable_puppet_plugins_if_undesired.rb
diff --git a/config/katello.migrations/211020223805-add-proxy-host-reports.rb b/config/katello.migrations/20211020223805_add_proxy_host_reports.rb
similarity index 100%
rename from config/katello.migrations/211020223805-add-proxy-host-reports.rb
rename to config/katello.migrations/20211020223805_add_proxy_host_reports.rb
diff --git a/config/katello.migrations/211020223956-add-host-reports.rb b/config/katello.migrations/20211020223956_add_host_reports.rb
similarity index 100%
rename from config/katello.migrations/211020223956-add-host-reports.rb
rename to config/katello.migrations/20211020223956_add_host_reports.rb
diff --git a/config/katello.migrations/211108174119-disable-registration-without-templates.rb b/config/katello.migrations/20211108174119_disable_registration_without_templates.rb
similarity index 100%
rename from config/katello.migrations/211108174119-disable-registration-without-templates.rb
rename to config/katello.migrations/20211108174119_disable_registration_without_templates.rb
diff --git a/hooks/pre_migrations/rename_naming_convention.rb b/hooks/pre_migrations/rename_naming_convention.rb
new file mode 100644
index 00000000..f50e4f19
--- /dev/null
+++ b/hooks/pre_migrations/rename_naming_convention.rb
@@ -0,0 +1,25 @@
+# Previously some migrations followed the convention of +%y%m%d%H%M%S as a date
+# prefix and dashes. At some point the migrations were changed to +%Y%m%d%H%M%S
+migrations_dir = kafo.config.migrations_dir
+migrations = Kafo::Migrations.new(migrations_dir)
+
+changed = []
+migrations.applied.each_with_index do |item, index|
+  old_filename = File.join(migrations_dir, "#{item}.rb")
+  next if File.exist?(old_filename)
+
+  ["20#{item.gsub('-', '_')}", item.gsub('-', '_')].each do |new_name|
+    new_filename = File.join(migrations_dir, "#{new_name}.rb")
+    if File.exist?(new_filename)
+      migrations.applied[index] = new_name
+      changed << item
+    end
+  end
+end
+
+if changed.any?
+  migrations.store_applied
+  Kafo.request_config_reload
+end
+
+changed
diff --git a/spec/hooks/rename_naming_convention.rb b/spec/hooks/rename_naming_convention.rb
new file mode 100644
index 00000000..caa7b8b2
--- /dev/null
+++ b/spec/hooks/rename_naming_convention.rb
@@ -0,0 +1,111 @@
+require 'spec_helper'
+require 'tmpdir'
+require 'fileutils'
+require 'kafo/hook_context'
+
+describe 'rename_naming_convention' do
+  let(:config) { instance_double('Kafo::Configuration') }
+  let(:kafo) { instance_double('Kafo::KafoConfigure') }
+  let(:logger) { instance_double('Logger') }
+  let(:migrations_dir) { Dir.mktmpdir('installer-rename_naming_convention-') }
+  let(:applied) { File.join(migrations_dir, '.applied') }
+  let(:new_migration_name) { '20201217175955_stricter_ciphers' }
+
+  subject do
+    file = 'hooks/pre_migrations/rename_naming_convention.rb'
+    hook = File.read(file)
+    hook_block = proc { instance_eval(hook, file, 1) }
+    Kafo::HookContext.execute(kafo, logger, &hook_block)
+  end
+
+  before do
+    allow(kafo).to receive(:config).and_return(config)
+    allow(config).to receive(:migrations_dir).and_return(migrations_dir)
+    allow(Kafo).to receive(:request_config_reload)
+  end
+
+  after do
+    FileUtils.rm_r(migrations_dir)
+  end
+
+  describe 'no migrations' do
+    it do
+      expect(subject).to match_array([])
+      expect(Kafo).not_to have_received(:request_config_reload)
+    end
+  end
+
+  describe 'with migrations' do
+    before do
+      FileUtils.touch(File.join(migrations_dir, "#{new_migration_name}.rb"))
+    end
+
+    context 'without an applied' do
+      it do
+        expect(subject).to match_array([])
+        expect(Kafo).not_to have_received(:request_config_reload)
+      end
+    end
+
+    context 'with an applied' do
+      before do
+        File.write(applied, applied_content.to_yaml)
+      end
+
+      context 'that is empty' do
+        let(:applied_content) { [] }
+
+        it do
+          expect(subject).to match_array([])
+          expect(Kafo::Migrations.new(migrations_dir).applied).to match_array([])
+          expect(Kafo).not_to have_received(:request_config_reload)
+        end
+      end
+
+      context 'that has a renamed migration' do
+        let(:applied_content) { ['201217175955-stricter-ciphers'] }
+
+        it do
+          expect(subject).to match_array(['201217175955-stricter-ciphers'])
+          expect(Kafo::Migrations.new(migrations_dir).applied).to match_array([new_migration_name])
+          expect(Kafo).to have_received(:request_config_reload).once
+        end
+      end
+
+      context 'that has multiple renamed migrations' do
+        # This just renames dashes to underscores, already has YYYY
+        before do
+          FileUtils.touch(File.join(migrations_dir, "20210331121715_clear_puppetserver_nil_metrics.rb"))
+        end
+
+        let(:applied_content) { ['20210331121715_clear_puppetserver-nil-metrics', '201217175955-stricter-ciphers'] }
+
+        it do
+          expect(subject).to match_array(['20210331121715_clear_puppetserver-nil-metrics', '201217175955-stricter-ciphers'])
+          expect(Kafo::Migrations.new(migrations_dir).applied).to match_array(['20210331121715_clear_puppetserver_nil_metrics', new_migration_name])
+          expect(Kafo).to have_received(:request_config_reload).once
+        end
+      end
+
+      context 'that has a removed migration' do
+        let(:applied_content) { ['has-been-removed'] }
+
+        it do
+          expect(subject).to match_array([])
+          expect(Kafo::Migrations.new(migrations_dir).applied).to match_array(['has-been-removed'])
+          expect(Kafo).not_to have_received(:request_config_reload)
+        end
+      end
+
+      context 'that is up to date' do
+        let(:applied_content) { [new_migration_name] }
+
+        it do
+          expect(subject).to match_array([])
+          expect(Kafo::Migrations.new(migrations_dir).applied).to match_array([new_migration_name])
+          expect(Kafo).not_to have_received(:request_config_reload)
+        end
+      end
+    end
+  end
+end