From 00d4e68111e53be782ba395c3f718daa10db0579 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 24 Apr 2023 15:59:52 -0700 Subject: [PATCH] Remove stream.yml from testnode role; leave repo files be Signed-off-by: Dan Mick --- roles/testnode/tasks/yum/stream.yml | 12 ------------ roles/testnode/tasks/yum_systems.yml | 6 ------ 2 files changed, 18 deletions(-) delete mode 100644 roles/testnode/tasks/yum/stream.yml diff --git a/roles/testnode/tasks/yum/stream.yml b/roles/testnode/tasks/yum/stream.yml deleted file mode 100644 index c216c9ea..00000000 --- a/roles/testnode/tasks/yum/stream.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# In non-Stream CentOS versions, ceph-cm-ansible takes care of overwriting the Distro/ISO-provided repo files. -# Since we convert from CentOS 8.X to CentOS Stream, we have to delete the Stream repo files that the process creates. -# We just don't want to rely on CentOS' infra to provide our mirror lists. It has bitten us in the past. -- name: Clean up Stream distro-provided repos - shell: "rm -rvf /etc/yum.repos.d/*-Stream-*" - -- name: Include CentOS Stream specific variables - include_vars: "{{ item }}" - with_first_found: - - "{{ ansible_distribution | lower | regex_replace(' ', '_') }}_{{ ansible_distribution_major_version }}_stream.yml" - - empty.yml diff --git a/roles/testnode/tasks/yum_systems.yml b/roles/testnode/tasks/yum_systems.yml index 2be3c5c0..09d13c87 100644 --- a/roles/testnode/tasks/yum_systems.yml +++ b/roles/testnode/tasks/yum_systems.yml @@ -74,12 +74,6 @@ tags: - repos -- name: Perform CentOS Stream related tasks - import_tasks: yum/stream.yml - when: is_stream|default('false')|bool - tags: - - repos - - name: Setup local repo files. import_tasks: yum/repos.yml tags: -- 2.47.3