Require osd_scenario parameter to be provided in containerized deploy

Fixes: #2095
pull/2097/head
John Fulton 2017-10-23 15:16:03 +00:00
parent 2bc58684e5
commit 7a7ddab6c2
1 changed files with 0 additions and 5 deletions

View File

@ -26,7 +26,6 @@
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
- osd_scenario == 'dummy' - osd_scenario == 'dummy'
- name: make sure a valid osd scenario was chosen - name: make sure a valid osd scenario was chosen
@ -35,7 +34,6 @@
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
- not osd_scenario in valid_osd_scenarios - not osd_scenario in valid_osd_scenarios
- name: verify devices have been provided - name: verify devices have been provided
@ -103,7 +101,6 @@
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
- osd_scenario == 'non-collocated' - osd_scenario == 'non-collocated'
- dedicated_devices|length == 0 - dedicated_devices|length == 0
or devices|length == 0 or devices|length == 0
@ -114,7 +111,6 @@
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
- osd_scenario == 'non-collocated' - osd_scenario == 'non-collocated'
- dedicated_devices is string - dedicated_devices is string
- dedicated_devices|length == 0 - dedicated_devices|length == 0
@ -126,6 +122,5 @@
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
- osd_objectstore == 'bluestore' - osd_objectstore == 'bluestore'
- ceph_release_num[ceph_release] < ceph_release_num.luminous - ceph_release_num[ceph_release] < ceph_release_num.luminous