ceph-osd: port activate_osds task to use new ceph version facts

Signed-off-by: Alfredo Deza <adeza@redhat.com>
pull/737/head
Alfredo Deza 2016-04-27 10:43:09 -04:00
parent 50377e19b4
commit 9d21a3c56c
1 changed files with 5 additions and 5 deletions

View File

@ -57,7 +57,7 @@
ansible_selinux != false and ansible_selinux != false and
ansible_selinux['status'] == 'enabled' and ansible_selinux['status'] == 'enabled' and
ansible_selinux['config_mode'] != 'disabled' and ansible_selinux['config_mode'] != 'disabled' and
not is_ceph_infernalis is_before_infernalis
- name: start and add that the osd service(s) to the init sequence (before infernalis) - name: start and add that the osd service(s) to the init sequence (before infernalis)
service: service:
@ -66,7 +66,7 @@
enabled: yes enabled: yes
when: when:
ansible_distribution != "Ubuntu" and ansible_distribution != "Ubuntu" and
not is_ceph_infernalis is_before_infernalis
- name: get osd id (for or after infernalis) - name: get osd id (for or after infernalis)
shell: "ls /var/lib/ceph/osd/ |grep -oh '[0-9]*'" shell: "ls /var/lib/ceph/osd/ |grep -oh '[0-9]*'"
@ -75,7 +75,7 @@
register: osd_id register: osd_id
when: when:
ansible_distribution != "Ubuntu" and ansible_distribution != "Ubuntu" and
is_ceph_infernalis is_after_hammer
- name: enable osd service instance(s) (for or after infernalis) - name: enable osd service instance(s) (for or after infernalis)
file: file:
@ -86,7 +86,7 @@
failed_when: false failed_when: false
when: when:
ansible_distribution != "Ubuntu" and ansible_distribution != "Ubuntu" and
is_ceph_infernalis is_after_hammer
- name: start and add that the osd service(s) to the init sequence (for or after infernalis) - name: start and add that the osd service(s) to the init sequence (for or after infernalis)
service: service:
@ -97,4 +97,4 @@
changed_when: false changed_when: false
when: when:
ansible_distribution != "Ubuntu" and ansible_distribution != "Ubuntu" and
is_ceph_infernalis is_after_hammer