ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2097 from fultonj/issue/2095 

Require osd_scenario parameter to be provided in containerized deploy
pull/2098/head
Sébastien Han 2017-10-24 13:59:51 +02:00 committed by GitHub
parent 751da93b08 7a7ddab6c2
commit 049729b8d3
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/ceph-osd/tasks/check_mandatory_vars.yml
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