From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 27 Apr 2016 14:43:09 +0000 (-0400)
Subject: ceph-osd: port activate_osds  task to use new ceph version facts
X-Git-Tag: ceph-ansible-1.0.5-33~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb794ed65398f3aac4f8385ff574a003b46b0907;p=ceph-ansible.git

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

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/roles/ceph-osd/tasks/activate_osds.yml b/roles/ceph-osd/tasks/activate_osds.yml
index 81c9ea36e..1a8841f24 100644
--- a/roles/ceph-osd/tasks/activate_osds.yml
+++ b/roles/ceph-osd/tasks/activate_osds.yml
@@ -57,7 +57,7 @@
     ansible_selinux != false and
     ansible_selinux['status'] == 'enabled' 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)
   service:
@@ -66,7 +66,7 @@
     enabled: yes
   when:
     ansible_distribution != "Ubuntu" and
-    not is_ceph_infernalis
+    is_before_infernalis
 
 - name: get osd id (for or after infernalis)
   shell: "ls /var/lib/ceph/osd/ | grep '-' | cut -d '-' -f 2"
@@ -75,7 +75,7 @@
   register: osd_id
   when:
     ansible_distribution != "Ubuntu" and
-    is_ceph_infernalis
+    is_after_hammer
 
 - name: enable osd service instance(s) (for or after infernalis)
   file:
@@ -86,7 +86,7 @@
   failed_when: false
   when:
     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)
   service:
@@ -97,4 +97,4 @@
   changed_when: false
   when:
     ansible_distribution != "Ubuntu" and
-    is_ceph_infernalis
+    is_after_hammer