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

Evades validation of ceph_repository_type in containerized scenario 

This will prevent failure of site-docker.yml with configs in doc.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1769760

Signed-off-by: VasishtaShastry <vipin.indiasmg@gmail.com>
Co-Authored-By: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 9a1f1626c3)
pull/4749/head
VasishtaShastry 2019-11-07 17:30:21 +05:30 committed by Guillaume Abrioux
parent 8be15a46f5
commit e54b6be74e
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
roles/ceph-validate/tasks/main.yml
View File

@ -1,33 +1,34 @@
--- ---
- name: validate ceph_origin - name: validate repository variables in non-containerized scenario
fail: when: not containerized_deployment | bool
msg: "ceph_origin must be either 'repository', 'distro' or 'local'" block:
when: - name: validate ceph_origin
- not containerized_deployment | bool fail:
- ceph_origin not in ['repository', 'distro', 'local'] msg: "ceph_origin must be either 'repository', 'distro' or 'local'"
when: ceph_origin not in ['repository', 'distro', 'local']
- name: validate ceph_repository - name: validate ceph_repository
fail: fail:
msg: "ceph_repository must be either 'community', 'rhcs', 'dev', 'custom' or 'uca'" msg: "ceph_repository must be either 'community', 'rhcs', 'dev', 'custom' or 'uca'"
when: when:
- ceph_origin == 'repository' - ceph_origin == 'repository'
- ceph_repository not in ['community', 'rhcs', 'dev', 'custom', 'uca'] - ceph_repository not in ['community', 'rhcs', 'dev', 'custom', 'uca']
- name: validate ceph_repository_community - name: validate ceph_repository_community
fail: fail:
msg: "ceph_stable_release must be either 'nautilus' or 'octopus'" msg: "ceph_stable_release must be either 'nautilus' or 'octopus'"
when: when:
- ceph_origin == 'repository' - ceph_origin == 'repository'
- ceph_repository == 'community' - ceph_repository == 'community'
- ceph_stable_release not in ['nautilus', 'octopus'] - ceph_stable_release not in ['nautilus', 'octopus']
- name: validate ceph_repository_type - name: validate ceph_repository_type
fail: fail:
msg: "ceph_repository_type must be either 'cdn' or 'iso'" msg: "ceph_repository_type must be either 'cdn' or 'iso'"
when: when:
- ceph_origin == 'repository' - ceph_origin == 'repository'
- ceph_repository == 'rhcs' - ceph_repository == 'rhcs'
- ceph_repository_type not in ['cdn', 'iso'] - ceph_repository_type not in ['cdn', 'iso']
- name: validate osd_objectstore - name: validate osd_objectstore
fail: fail: