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

Use the use_systemd fact when starting mdss 

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
pull/758/head
Andrew Schoen 2016-05-05 14:54:50 -05:00
parent 7436479c40
commit cb70d49751
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/ceph-common/handlers/main.yml
View File

@ -74,10 +74,9 @@
when: when:
socket.rc == 0 and socket.rc == 0 and
ansible_distribution != 'Ubuntu' and ansible_distribution != 'Ubuntu' and
not use_systemd and use_systemd and
mds_group_name in group_names and mds_group_name in group_names and
ceph_stable and is_before_infernalis
ceph_stable_release in ceph_stable_releases
- name: restart ceph mdss with systemd - name: restart ceph mdss with systemd
service: service:
@ -87,8 +86,7 @@
socket.rc == 0 and socket.rc == 0 and
use_systemd and use_systemd and
mds_group_name in group_names and mds_group_name in group_names and
ceph_stable and is_after_hammer
ceph_stable_release not in ceph_stable_releases
- name: restart ceph rgws on ubuntu - name: restart ceph rgws on ubuntu
command: initctl restart radosgw cluster={{ cluster }} id=rgw.{{ ansible_hostname }} command: initctl restart radosgw cluster={{ cluster }} id=rgw.{{ ansible_hostname }}

18
roles/ceph-mds/tasks/pre_requisite.yml
View File

@ -63,7 +63,7 @@
- done - done
- upstart - upstart
changed_when: false changed_when: false
when: ansible_distribution == "Ubuntu" when: not use_systemd
- name: activate metadata server with sysvinit - name: activate metadata server with sysvinit
file: file:
@ -76,7 +76,7 @@
- done - done
- sysvinit - sysvinit
changed_when: false changed_when: false
when: ansible_distribution != "Ubuntu" when: use_systemd
- name: enable systemd unit file for mds instance (for or after infernalis) - name: enable systemd unit file for mds instance (for or after infernalis)
file: file:
@ -86,16 +86,16 @@
changed_when: false changed_when: false
failed_when: false failed_when: false
when: when:
ansible_distribution != "Ubuntu" and use_systemd and
is_after_hammer is_after_hammer
- name: start and add that the metadata service to the init sequence (ubuntu) - name: start and add that the metadata service to the init sequence (upstart)
command: initctl emit ceph-mds cluster={{ cluster }} id={{ mds_name }} command: initctl emit ceph-mds cluster={{ cluster }} id={{ mds_name }}
changed_when: false changed_when: false
failed_when: false failed_when: false
when: ansible_distribution == "Ubuntu" when: not use_systemd
- name: start and add that the metadata service to the init sequence (before infernalis) - name: start and add that the metadata service to the init sequence (systemd before infernalis)
service: service:
name: ceph name: ceph
state: started state: started
@ -103,15 +103,15 @@
args: mds.{{ mds_name }} args: mds.{{ mds_name }}
changed_when: false changed_when: false
when: when:
ansible_distribution != "Ubuntu" and use_systemd and
is_before_infernalis is_before_infernalis
- name: start and add that the metadata service to the init sequence (for or after infernalis) - name: start and add that the metadata service to the init sequence (systemd after hammer)
service: service:
name: ceph-mds@{{ mds_name }} name: ceph-mds@{{ mds_name }}
state: started state: started
enabled: yes enabled: yes
changed_when: false changed_when: false
when: when:
ansible_distribution != "Ubuntu" and use_systemd and
is_after_hammer is_after_hammer