From 5aea478fc34c0d271fd3d3871101de1fde6838cf Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Wed, 4 Jan 2017 10:03:50 -0600 Subject: [PATCH] Set correct release for ceph pin This patch sets the correct release name for Ceph packages. It was originally `Inktank` but it has now changed to `RedHat`. The `ceph_pin_pref.j2` file was removed since it isn't used by any of the tasks in the role. Closes-Bug: 1646855 Change-Id: If45055cdcaebbc47e6091bac84adf8bec00f8bec --- defaults/main.yml | 2 +- templates/ceph_pin.pref.j2 | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 templates/ceph_pin.pref.j2 diff --git a/defaults/main.yml b/defaults/main.yml index f646b39..29717cb 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -42,7 +42,7 @@ ceph_client_package_state: "latest" # unlike the other options does not attempt to manage package keys or add additional # package repositories. ceph_pkg_source: ceph -ceph_apt_pinned_packages: [{ package: "*", release: Inktank, priority: 1001 }] +ceph_apt_pinned_packages: [{ package: "*", release: "RedHat", priority: 1001 }] # Ubuntu Cloud Archive mirror URL # This is only used if 'uca' is the selected option for ceph_pkg_source diff --git a/templates/ceph_pin.pref.j2 b/templates/ceph_pin.pref.j2 deleted file mode 100644 index 5290edc..0000000 --- a/templates/ceph_pin.pref.j2 +++ /dev/null @@ -1,5 +0,0 @@ -# {{ ansible_managed }} - -Package: * -Pin: release o=Inktank -Pin-Priority: 1001