From 3af17a31370cfc766607686b35d9000e175f696e Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 27 Apr 2016 10:34:08 -0400 Subject: [PATCH] ceph-common: port main handler to use new ceph version facts Signed-off-by: Alfredo Deza --- roles/ceph-common/handlers/main.yml | 16 ++++++++-------- roles/ceph-common/tasks/main.yml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/ceph-common/handlers/main.yml b/roles/ceph-common/handlers/main.yml index 62422a066..ca7102645 100644 --- a/roles/ceph-common/handlers/main.yml +++ b/roles/ceph-common/handlers/main.yml @@ -8,8 +8,8 @@ when: socket.rc == 0 and ansible_distribution != 'Ubuntu' and - mon_group_name in group_names and not - is_ceph_infernalis + mon_group_name in group_names and + is_before_infernalis - name: restart ceph mons with systemd service: @@ -19,7 +19,7 @@ socket.rc == 0 and ansible_distribution != 'Ubuntu' and mon_group_name in group_names and - is_ceph_infernalis + is_after_hammer - name: restart ceph mons on ubuntu command: initctl restart ceph-mon cluster={{ cluster }} id={{ monitor_name }} @@ -34,7 +34,7 @@ socket.rc == 0 and ansible_distribution != 'Ubuntu' and osd_group_name in group_names and - not is_ceph_infernalis + is_before_infernalis # This does not just restart OSDs but everything else too. Unfortunately # at this time the ansible role does not have an OSD id list to use @@ -47,7 +47,7 @@ socket.rc == 0 and ansible_distribution != 'Ubuntu' and osd_group_name in group_names and - is_ceph_infernalis + is_after_hammer - name: restart ceph osds on ubuntu shell: | @@ -99,7 +99,7 @@ socketrgw.rc == 0 and ansible_distribution != 'Ubuntu' and rgw_group_name in group_names and - not is_ceph_infernalis + is_before_infernalis - name: restart ceph rgws on red hat command: /etc/init.d/ceph-radosgw restart @@ -107,7 +107,7 @@ socketrgw.rc == 0 and ansible_os_family == 'RedHat' and rgw_group_name in group_names and - not is_ceph_infernalis + is_before_infernalis - name: restart ceph rgws with systemd service: @@ -117,7 +117,7 @@ socketrgw.rc == 0 and ansible_distribution != 'Ubuntu' and rgw_group_name in group_names and - is_ceph_infernalis + is_after_hammer - name: restart apache2 service: diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 2504edfe7..3513e63ca 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -1,6 +1,4 @@ --- -- include: facts.yml - - include: ./checks/check_system.yml - include: ./checks/check_mandatory_vars.yml @@ -66,6 +64,8 @@ tags: - package-install +- include: facts.yml + - set_fact: dir_owner: ceph dir_group: ceph -- 2.39.5