From 920bd9cf2db404ee3b93b8521451df2e7332cda4 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 17 Feb 2017 14:27:15 -0600 Subject: [PATCH] ceph-common: use yum_repository when adding the ceph_stable repo This gives us more flexibility than installing the ceph-release package as we can easily use different mirrors. Also, I noticed an issue when upgrading from jewel -> kraken as the ceph-release package for those releases both have the same version number and yum doesn't know to update anything. Signed-off-by: Andrew Schoen --- .../tasks/installs/redhat_ceph_repository.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml b/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml index a90309653..b0f285b3e 100644 --- a/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml +++ b/roles/ceph-common/tasks/installs/redhat_ceph_repository.yml @@ -6,19 +6,15 @@ when: ceph_stable - name: add ceph stable repository - package: - name: "{{ ceph_mirror }}/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm" + yum_repository: + name: ceph_stable + description: Ceph Stable repo + gpgcheck: yes state: present - changed_when: false + gpgkey: "{{ ceph_stable_key }}" + baseurl: "{{ ceph_mirror }}/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/$basearch" when: ceph_stable -- name: change download url to ceph mirror - replace: - name: /etc/yum.repos.d/ceph.repo - regexp: http://download.ceph.com - replace: "{{ ceph_mirror }}" - when: ceph_mirror != "http://download.ceph.com" - # we must use curl instead of ansible's uri module because SNI support in # Python is only available in 2.7.9 and later, and most supported distributions # don't have that version, so a request to https fails.