mirror of https://github.com/ceph/ceph-ansible.git
Merge pull request #2097 from fultonj/issue/2095
Require osd_scenario parameter to be provided in containerized deploypull/2098/head
commit
049729b8d3
|
@ -26,7 +26,6 @@
|
|||
when:
|
||||
- osd_group_name is defined
|
||||
- osd_group_name in group_names
|
||||
- not containerized_deployment
|
||||
- osd_scenario == 'dummy'
|
||||
|
||||
- name: make sure a valid osd scenario was chosen
|
||||
|
@ -35,7 +34,6 @@
|
|||
when:
|
||||
- osd_group_name is defined
|
||||
- osd_group_name in group_names
|
||||
- not containerized_deployment
|
||||
- not osd_scenario in valid_osd_scenarios
|
||||
|
||||
- name: verify devices have been provided
|
||||
|
@ -103,7 +101,6 @@
|
|||
when:
|
||||
- osd_group_name is defined
|
||||
- osd_group_name in group_names
|
||||
- not containerized_deployment
|
||||
- osd_scenario == 'non-collocated'
|
||||
- dedicated_devices|length == 0
|
||||
or devices|length == 0
|
||||
|
@ -114,7 +111,6 @@
|
|||
when:
|
||||
- osd_group_name is defined
|
||||
- osd_group_name in group_names
|
||||
- not containerized_deployment
|
||||
- osd_scenario == 'non-collocated'
|
||||
- dedicated_devices is string
|
||||
- dedicated_devices|length == 0
|
||||
|
@ -126,6 +122,5 @@
|
|||
when:
|
||||
- osd_group_name is defined
|
||||
- osd_group_name in group_names
|
||||
- not containerized_deployment
|
||||
- osd_objectstore == 'bluestore'
|
||||
- ceph_release_num[ceph_release] < ceph_release_num.luminous
|
||||
|
|
Loading…
Reference in New Issue