lvm-osds: reorder mandatory vars checks

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
pull/1716/head
Andrew Schoen 2017-07-27 10:04:53 -05:00
parent 96c92a154e
commit 3b5a06bb3c
1 changed files with 14 additions and 14 deletions

View File

@ -46,15 +46,15 @@
- not osd_auto_discovery - not osd_auto_discovery
- devices|length == 0 - devices|length == 0
- name: verify lvm_volumes have been provided - name: check if lvm_osds is supported by the selected ceph version
fail: fail:
msg: "please provide lvm_volumes to your osd scenario" msg: "lvm_osds is not supported by the selected Ceph version, use Luminous or above."
when: when:
- osd_group_name is defined - osd_group_name is defined
- osd_group_name in group_names - osd_group_name in group_names
- not containerized_deployment
- lvm_osds - lvm_osds
- not osd_auto_discovery - ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
- lvm_volumes|length == 0
- name: verify osd_objectstore is 'filestore' when using lvm_osds - name: verify osd_objectstore is 'filestore' when using lvm_osds
fail: fail:
@ -66,6 +66,16 @@
- not osd_auto_discovery - not osd_auto_discovery
- osd_objectstore != 'filestore' - osd_objectstore != 'filestore'
- name: verify lvm_volumes have been provided
fail:
msg: "please provide lvm_volumes to your osd scenario"
when:
- osd_group_name is defined
- osd_group_name in group_names
- lvm_osds
- not osd_auto_discovery
- lvm_volumes|length == 0
- name: make sure the lvm_volumes variable is a dictionary - name: make sure the lvm_volumes variable is a dictionary
fail: fail:
msg: "lvm_volumes: must be a dictionary" msg: "lvm_volumes: must be a dictionary"
@ -117,13 +127,3 @@
- not containerized_deployment - not containerized_deployment
- osd_objectstore == 'bluestore' - osd_objectstore == 'bluestore'
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous - ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous
- name: check if lvm_osds is supported by the selected ceph version
fail:
msg: "lvm_osds is not supported by the selected Ceph version, use Luminous or above."
when:
- osd_group_name is defined
- osd_group_name in group_names
- not containerized_deployment
- lvm_osds
- ceph_release_num.{{ ceph_release }} < ceph_release_num.luminous