From: David Galloway Date: Thu, 15 Jun 2017 16:00:22 +0000 (-0400) Subject: testnode: Perform repo tasks on all Ubuntu testnodes X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7eb1a33dcb98257a2646de330169d2840c09ce6f;p=ceph-cm-ansible.git testnode: Perform repo tasks on all Ubuntu testnodes Just realized apt/repos.yml hasn't been getting run on Xenial testnodes. There are some important tasks in there that should be run (e.g., Removing custom repos from /etc/apt/sources.list.d). We aren't using apt-mirror for Xenial so I've limited writing the master sources.list to Trusty and earlier. Signed-off-by: David Galloway --- diff --git a/roles/testnode/tasks/apt/repos.yml b/roles/testnode/tasks/apt/repos.yml index 5a7eacd5..0bba0247 100644 --- a/roles/testnode/tasks/apt/repos.yml +++ b/roles/testnode/tasks/apt/repos.yml @@ -21,6 +21,8 @@ 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 @@ -29,7 +31,8 @@ group: root mode: 0644 register: sources - when: ansible_architecture != "aarch64" + when: ansible_architecture != "aarch64" and + ansible_distribution_major_version|int < 15 - name: Install apt keys apt_key: diff --git a/roles/testnode/tasks/apt_systems.yml b/roles/testnode/tasks/apt_systems.yml index 53b65989..2319d66e 100644 --- a/roles/testnode/tasks/apt_systems.yml +++ b/roles/testnode/tasks/apt_systems.yml @@ -1,9 +1,6 @@ --- -# 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: Setup local repo files. include: apt/repos.yml - when: ansible_distribution_major_version|int < 15 tags: - repos