From: James Saint-Rossy <james_saintrossy@cable.comcast.com>
Date: Wed, 13 Apr 2016 01:26:59 +0000 (-0400)
Subject: fixed handling of new ceph_version
X-Git-Tag: v1.0.6~162^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fc270bb772d13f23ba3a49303f31b5876a6d2f1b;p=ceph-ansible.git

fixed handling of new ceph_version
---

fc270bb772d13f23ba3a49303f31b5876a6d2f1b
diff --cc roles/ceph-mon/tasks/create_mds_filesystems.yml
index 7194312d1,7194312d1..1bc826cfe
--- a/roles/ceph-mon/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mon/tasks/create_mds_filesystems.yml
@@@ -9,9 -9,9 +9,9 @@@
      - cephfs_data
      - cephfs_metadata
    changed_when: false
--  when: not {{ ceph_version.stdout | version_compare('0.84', '<') }}
++  when: not {{ ceph_version | version_compare('0.80.0', '<') }}
  
  - name: create ceph filesystem
    command: ceph --cluster {{ cluster }} fs new {{ cephfs }} {{ cephfs_metadata }} {{ cephfs_data }}
    changed_when: false
--  when: not {{ ceph_version.stdout | version_compare('0.84', '<') }}
++  when: not {{ ceph_version | version_compare('0.80.0', '<') }}
diff --cc roles/ceph-mon/tasks/secure_cluster.yml
index 8227cdc8a,8227cdc8a..5ee48ca5e
--- a/roles/ceph-mon/tasks/secure_cluster.yml
+++ b/roles/ceph-mon/tasks/secure_cluster.yml
@@@ -2,11 -2,11 +2,11 @@@
  - name: collect all the pools
    command: rados --cluster {{ cluster }} lspools
    register: ceph_pools
--  when: "{{ ceph_version.stdout | version_compare('0.94', '>=') }}"
++  when: "{{ ceph_version | version_compare('0.94.0', '>=') }}"
  
  - name: secure the cluster
    command: ceph --cluster {{ cluster }} osd pool set {{ item[0] }} {{ item[1] }} true
    with_nested:
      - ceph_pools.stdout_lines
      - secure_cluster_flags
--  when: "{{ ceph_version.stdout | version_compare('0.94', '>=') }}"
++  when: "{{ ceph_version | version_compare('0.94.0', '>=') }}"
diff --cc roles/ceph-mon/tasks/start_monitor.yml
index 9d907b3fa,9d907b3fa..529a2591f
--- a/roles/ceph-mon/tasks/start_monitor.yml
+++ b/roles/ceph-mon/tasks/start_monitor.yml
@@@ -53,9 -53,9 +53,3 @@@
    changed_when: false
    failed_when:  false
    when: cephx
--
--- name: get ceph monitor version
--  shell: ceph --cluster {{ cluster }} daemon mon."{{ monitor_name }}" version | cut -d '"' -f 4 | cut -f 1,2 -d '.'
--  changed_when: false
--  failed_when: "'No such file or directory' in ceph_version.stderr"
--  register: ceph_version