ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from flisky/master 

fsid & ceph_stable_redhat_distro fixs up
pull/198/head
Leseb 2015-01-26 10:02:54 +01:00
parent 7dd08f7bf5 8eca518348
commit 5cb96fd3db
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all
View File

@ -19,7 +19,7 @@ dummy:
#ceph_stable_release: giant # ceph stable release #ceph_stable_release: giant # ceph stable release
# This option is needed for _both_ stable and dev version, so please always fill the right version # 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 #ceph_stable_redhat_distro: el7
# ENTERPRISE VERSION # ENTERPRISE VERSION

2
roles/ceph-common/defaults/main.yml
View File

@ -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 ceph_stable_release: giant # ceph stable release
# This option is needed for _both_ stable and dev version, so please always fill the right version # 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 ceph_stable_redhat_distro: el7
# ENTERPRISE VERSION # ENTERPRISE VERSION

3
roles/ceph-common/tasks/install_on_redhat.yml
View File

@ -8,6 +8,7 @@
- ntp - ntp
- hdparm - hdparm
- yum-plugin-priorities.noarch - yum-plugin-priorities.noarch
- epel-release
- name: Install the Ceph stable repository key - name: Install the Ceph stable repository key
rpm_key: > rpm_key: >
@ -28,7 +29,7 @@
when: ceph_stable_ice when: ceph_stable_ice
- name: Add Ceph stable repository - 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 when: ceph_stable
- name: Add Ceph development repository - name: Add Ceph development repository

2
roles/ceph-mon/tasks/deploy_monitors.yml
View File

@ -18,7 +18,7 @@
mode=0644 mode=0644
- name: Ceph monitor mkfs - 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 - name: Start and add that the monitor service to the init sequence
service: > service: >