From: Yin Jifeng <jifeng.yin@gmail.com>
Date: Thu, 22 Jan 2015 12:07:46 +0000 (+0800)
Subject: update ceph noarch repo url
X-Git-Tag: v1.0.0~262^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30ac90dcfaef38cc736442e2fb4e01e4a3575d46;p=ceph-ansible.git

update ceph noarch repo url
---

diff --git a/group_vars/all b/group_vars/all
index 8b4dfb3db..128a4b592 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -19,7 +19,7 @@ dummy:
 #ceph_stable_release: giant # ceph stable release
 
 # This option is needed for _both_ stable and dev version, so please always fill the right version
-# # supported distros are el6, rhel6, f18, f19, opensuse12.2, sles11, centos7 (see http://ceph.com/rpm-firefly/)
+# # supported distros are el6, rhel6, f20, el7, rhel7 (see http://ceph.com/rpm-giant/)
 #ceph_stable_redhat_distro: el7
 
 # ENTERPRISE VERSION
diff --git a/roles/ceph-common/tasks/install_on_redhat.yml b/roles/ceph-common/tasks/install_on_redhat.yml
index efb6b9801..189b02549 100644
--- a/roles/ceph-common/tasks/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/install_on_redhat.yml
@@ -28,7 +28,7 @@
   when: ceph_stable_ice
 
 - name: Add Ceph stable repository
-  command: "rpm -U http://ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.el6.noarch.rpm creates=/etc/yum.repos.d/ceph.repo"
+  command: "rpm -U http://ceph.com/rpm-{{ ceph_stable_release }}/{{ ceph_stable_redhat_distro }}/noarch/ceph-release-1-0.{{ ceph_stable_redhat_distro|replace('rhel', 'el') }}.noarch.rpm creates=/etc/yum.repos.d/ceph.repo"
   when: ceph_stable
 
 - name: Add Ceph development repository