Skip to content

Commit 751d2ca

Browse files
authored
Merge pull request #776 from ceph/apt-cruft
testnode: Remove needless tasks
2 parents fcd39aa + 420d8d4 commit 751d2ca

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

roles/testnode/tasks/apt/repos.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
11
---
2-
# Check for and remove custom repos.
3-
# http://tracker.ceph.com/issues/12794
4-
- name: Check for custom repos
5-
shell: "ls -1 /etc/apt/sources.list.d/"
6-
register: custom_repos
7-
changed_when: false
8-
9-
- name: Remove custom repos
10-
file: path=/etc/apt/sources.list.d/{{ item }} state=absent
11-
with_items: "{{ custom_repos.stdout_lines|default([]) }}"
12-
# Ignore changes here because we will be removing repos that we end up re-adding later
13-
changed_when: false
14-
152
- name: Set apt preferences
163
template:
174
dest: "/etc/apt/preferences.d/ceph.pref"
@@ -21,19 +8,6 @@
218
mode: 0644
229
register: apt_prefs
2310

24-
# Starting with ubuntu 15.04 we no longer maintain our own package mirrors.
25-
# For anything ubuntu < 15.04 or debian <=7 we still do.
26-
- name: Add sources list
27-
template:
28-
dest: /etc/apt/sources.list
29-
src: "apt/sources.list.{{ ansible_distribution_release | lower }}"
30-
owner: root
31-
group: root
32-
mode: 0644
33-
register: sources
34-
when: ansible_architecture != "aarch64" and
35-
ansible_distribution_major_version|int < 15
36-
3711
- name: Install apt keys
3812
apt_key:
3913
url: "{{ item }}"

0 commit comments

Comments
 (0)