diff --git a/pipelines/upgrade/05-server_to_intermediate.yml b/pipelines/upgrade/05-server_to_intermediate.yml index 86e3cb7a3..4886d440c 100644 --- a/pipelines/upgrade/05-server_to_intermediate.yml +++ b/pipelines/upgrade/05-server_to_intermediate.yml @@ -22,6 +22,3 @@ - foreman_server_repositories - role: foreman_installer foreman_installer_skip_installer: "{{ true if forklift_upgrade_version_start == forklift_upgrade_version_intermediate else false }}" - - role: cleanup_rh_ruby25 - when: - - forklift_upgrade_version_intermediate == "2.5" or forklift_upgrade_version_intermediate == "4.1" diff --git a/pipelines/upgrade/06-proxy_to_intermediate.yml b/pipelines/upgrade/06-proxy_to_intermediate.yml index 4252a3e03..7529486d1 100644 --- a/pipelines/upgrade/06-proxy_to_intermediate.yml +++ b/pipelines/upgrade/06-proxy_to_intermediate.yml @@ -23,6 +23,3 @@ - foreman_server_repositories - role: foreman_proxy_content when: forklift_upgrade_version_start != forklift_upgrade_version_intermediate - - role: cleanup_rh_ruby25 - when: - - forklift_upgrade_version_intermediate == "2.5" or forklift_upgrade_version_intermediate == "4.1" diff --git a/pipelines/upgrade/07-server_to_final.yml b/pipelines/upgrade/07-server_to_final.yml index 5c827790d..991eb7d14 100644 --- a/pipelines/upgrade/07-server_to_final.yml +++ b/pipelines/upgrade/07-server_to_final.yml @@ -21,6 +21,3 @@ scenario_version: "{{ forklift_upgrade_version_final }}" - foreman_server_repositories - foreman_installer - - role: cleanup_rh_ruby25 - when: - - forklift_upgrade_version_final == "nightly" or forklift_upgrade_version_final == "2.5" or forklift_upgrade_version_final == "4.1" diff --git a/pipelines/upgrade/09-proxy_to_final.yml b/pipelines/upgrade/09-proxy_to_final.yml index 3a2abb674..063f49273 100644 --- a/pipelines/upgrade/09-proxy_to_final.yml +++ b/pipelines/upgrade/09-proxy_to_final.yml @@ -22,6 +22,3 @@ scenario_version: "{{ forklift_upgrade_version_final }}" - foreman_server_repositories - foreman_proxy_content - - role: cleanup_rh_ruby25 - when: - - forklift_upgrade_version_final == "nightly" or forklift_upgrade_version_final == "2.5" or forklift_upgrade_version_final == "4.1" diff --git a/roles/cleanup_rh_ruby25/tasks/main.yml b/roles/cleanup_rh_ruby25/tasks/main.yml deleted file mode 100644 index f387df4b5..000000000 --- a/roles/cleanup_rh_ruby25/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Remove rh-ruby25 packages - package: - state: absent - name: rh-ruby25* - when: - - ansible_os_family == "RedHat" - - ansible_distribution_major_version == '7'