testnodes: use gitbuilder_host in apt preferences.

Because we can template the gitbuilder_host now we don't need both
ceph.pref and ceph-redhat.pref.

Discussed in IRC today. It appears we can do this based on the history in Chef
(https://github.com/ceph/ceph-qa-chef/commit/7a5738732b17161b2d29e6535a64c519ea02706b
 and
 https://github.com/ceph/ceph-qa-chef/commit/66f7c40a21c6fb554e19731b56af310273607889)

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/testnode/tasks/apt/repos.yml b/roles/testnode/tasks/apt/repos.yml
index 0d95f04f7b668adee02ce02e323f70f0e6a93dae..68996516426eb0a8fc89da6fe9e0485a1b16f9cc 100644 (file)
--- a/roles/testnode/tasks/apt/repos.yml
+++ b/roles/testnode/tasks/apt/repos.yml
@@ -1,14 +1,11 @@
 ---
 - name: Set apt preferences
   template:
-    dest: "/etc/apt/preferences.d/{{ item }}"
-    src: "../../templates/apt/{{ item }}"
+    dest: "/etc/apt/preferences.d/ceph.pref"
+    src: "../../templates/apt/ceph.pref"
     owner: root
     group: root
     mode: 0644
-  with_items:
-    - ceph.pref
-    - ceph-redhat.pref
   register: apt_prefs
 
 - name: Add sources list

diff --git a/roles/testnode/templates/apt/ceph-redhat.pref b/roles/testnode/templates/apt/ceph-redhat.pref
deleted file mode 100644 (file)
index ec2f5b2..0000000
--- a/roles/testnode/templates/apt/ceph-redhat.pref
+++ /dev/null
@@ -1,4 +0,0 @@
-{# {{ ansible_managed }} #}
-Package: *
-Pin: origin gitbuilder.ceph.redhat.com
-Pin-Priority: 998

diff --git a/roles/testnode/templates/apt/ceph.pref b/roles/testnode/templates/apt/ceph.pref
index 64d0d033c012adf6dc5a66fba68baa0326fd606e..7cd94a94721f0e16ce053a96c6c75a8b20880b2f 100644 (file)
--- a/roles/testnode/templates/apt/ceph.pref
+++ b/roles/testnode/templates/apt/ceph.pref
@@ -1,4 +1,4 @@
 {# {{ ansible_managed }} #}
 Package: *
-Pin: origin gitbuilder.ceph.com
+Pin: origin {{ gitbuilder_host }}
 Pin-Priority: 999