From 30ac90dcfaef38cc736442e2fb4e01e4a3575d46 Mon Sep 17 00:00:00 2001 From: Yin Jifeng Date: Thu, 22 Jan 2015 20:07:46 +0800 Subject: [PATCH 1/4] update ceph noarch repo url --- group_vars/all | 2 +- roles/ceph-common/tasks/install_on_redhat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 2a2d977e397dff9a80285a0d95dcc47bce20ee4e Mon Sep 17 00:00:00 2001 From: Yin Jifeng Date: Thu, 22 Jan 2015 20:09:06 +0800 Subject: [PATCH 2/4] make sure we use **fsid** in command --- roles/ceph-mon/tasks/deploy_monitors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-mon/tasks/deploy_monitors.yml b/roles/ceph-mon/tasks/deploy_monitors.yml index f2830d220..59806cc21 100644 --- a/roles/ceph-mon/tasks/deploy_monitors.yml +++ b/roles/ceph-mon/tasks/deploy_monitors.yml @@ -18,7 +18,7 @@ mode=0644 - name: Ceph monitor mkfs - command: "ceph-mon --mkfs -i {{ ansible_hostname }} --fsid {{ cluster_uuid.stdout }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ ansible_hostname }} creates=/var/lib/ceph/mon/ceph-{{ ansible_hostname }}/keyring" + command: "ceph-mon --mkfs -i {{ ansible_hostname }} --fsid {{ fsid }} --keyring /var/lib/ceph/tmp/keyring.mon.{{ ansible_hostname }} creates=/var/lib/ceph/mon/ceph-{{ ansible_hostname }}/keyring" - name: Start and add that the monitor service to the init sequence service: > From e13aca8c5f18ef713a9cdb68ecd3979e0db54426 Mon Sep 17 00:00:00 2001 From: Yin Jifeng Date: Thu, 22 Jan 2015 21:35:20 +0800 Subject: [PATCH 3/4] epel-release is mandatory see: https://www.mail-archive.com/ceph-users@lists.ceph.com/msg14819.html also: https://github.com/ceph/ceph-deploy/commit/831b130f98a18db09c862f56e80b788bbf094373 --- roles/ceph-common/tasks/install_on_redhat.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/ceph-common/tasks/install_on_redhat.yml b/roles/ceph-common/tasks/install_on_redhat.yml index 189b02549..85325c442 100644 --- a/roles/ceph-common/tasks/install_on_redhat.yml +++ b/roles/ceph-common/tasks/install_on_redhat.yml @@ -8,6 +8,7 @@ - ntp - hdparm - yum-plugin-priorities.noarch + - epel-release - name: Install the Ceph stable repository key rpm_key: > From 8eca5183481590e7bfd8473eb93197be02d1e67e Mon Sep 17 00:00:00 2001 From: Yin Jifeng Date: Mon, 26 Jan 2015 14:22:06 +0800 Subject: [PATCH 4/4] update distro comment so we don't need change them every ceph release --- group_vars/all | 2 +- roles/ceph-common/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/all b/group_vars/all index 128a4b592..365a450f5 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, f20, el7, rhel7 (see http://ceph.com/rpm-giant/) +# # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/ #ceph_stable_redhat_distro: el7 # ENTERPRISE VERSION diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index 802e82621..05f76e889 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -16,7 +16,7 @@ ceph_stable_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.as 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/) +# # for supported distros, see http://ceph.com/rpm-{{ ceph_stable_release }}/ ceph_stable_redhat_distro: el7 # ENTERPRISE VERSION