From: David Galloway Date: Fri, 21 Mar 2025 21:22:36 +0000 (-0400) Subject: testnode: Remove needless tasks X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F776%2Fhead;p=ceph-cm-ansible.git testnode: Remove needless tasks The linked tracker above the custom repo removal task is from long before we had golden OS images (pre-FOG). Signed-off-by: David Galloway --- diff --git a/roles/testnode/tasks/apt/repos.yml b/roles/testnode/tasks/apt/repos.yml index 046a9e09..2ba8f227 100644 --- a/roles/testnode/tasks/apt/repos.yml +++ b/roles/testnode/tasks/apt/repos.yml @@ -1,17 +1,4 @@ --- -# Check for and remove custom repos. -# http://tracker.ceph.com/issues/12794 -- name: Check for custom repos - shell: "ls -1 /etc/apt/sources.list.d/" - register: custom_repos - changed_when: false - -- name: Remove custom repos - file: path=/etc/apt/sources.list.d/{{ item }} state=absent - with_items: "{{ custom_repos.stdout_lines|default([]) }}" - # Ignore changes here because we will be removing repos that we end up re-adding later - changed_when: false - - name: Set apt preferences template: dest: "/etc/apt/preferences.d/ceph.pref" @@ -21,19 +8,6 @@ mode: 0644 register: apt_prefs -# Starting with ubuntu 15.04 we no longer maintain our own package mirrors. -# For anything ubuntu < 15.04 or debian <=7 we still do. -- name: Add sources list - template: - dest: /etc/apt/sources.list - src: "apt/sources.list.{{ ansible_distribution_release | lower }}" - owner: root - group: root - mode: 0644 - register: sources - when: ansible_architecture != "aarch64" and - ansible_distribution_major_version|int < 15 - - name: Install apt keys apt_key: url: "{{ item }}"