From 41b09fcfa7adcdfcc2f842531db7378cc07ad0d6 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 20 Apr 2015 16:33:07 -0500 Subject: [PATCH] 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 --- roles/testnode/tasks/apt/repos.yml | 7 ++----- roles/testnode/templates/apt/ceph-redhat.pref | 4 ---- roles/testnode/templates/apt/ceph.pref | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 roles/testnode/templates/apt/ceph-redhat.pref diff --git a/roles/testnode/tasks/apt/repos.yml b/roles/testnode/tasks/apt/repos.yml index 0d95f04..6899651 100644 --- 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 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 64d0d03..7cd94a9 100644 --- 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 -- 2.39.5