]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-cm-ansible.git/commitdiff
testnode: do not provide custom repos or sources.list for vivid
authorAndrew Schoen <aschoen@redhat.com>
Tue, 16 Jun 2015 21:39:03 +0000 (16:39 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Wed, 17 Jun 2015 21:47:29 +0000 (16:47 -0500)
We'll be using distro provided packages for vivid so skip over defining
our custom packages for vivid.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
roles/testnode/tasks/apt_systems.yml

index c1ee7419ef1fa2f129588780fb594ae4904c4148..02fd62e5d72f5972326463d1de9d8a8c2e697e3b 100644 (file)
@@ -1,6 +1,17 @@
 ---
+# 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 < 15
+  tags:
+    - repos
+
+- name: Update apt cache.
+  apt:
+    update_cache: yes
+  when: ansible_distribution_major_version >= 15 and
+        ansible_distribution == "Ubuntu"
   tags:
     - repos