mirror of https://github.com/ceph/ceph-ansible.git
validate: add support for containerized_deployment
Signed-off-by: Andrew Schoen <aschoen@redhat.com>pull/2619/head
parent
5d64eb79c1
commit
d30a99c350
|
@ -36,6 +36,7 @@ class ActionModule(ActionBase):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
notario_store["groups"] = host_vars["groups"]
|
notario_store["groups"] = host_vars["groups"]
|
||||||
|
notario_store["containerized_deployment"] = host_vars["containerized_deployment"]
|
||||||
notario.validate(host_vars, install_options, defined_keys=True)
|
notario.validate(host_vars, install_options, defined_keys=True)
|
||||||
|
|
||||||
if host_vars["ceph_origin"] == "repository":
|
if host_vars["ceph_origin"] == "repository":
|
||||||
|
@ -108,7 +109,8 @@ def osd_objectstore_choices(value):
|
||||||
|
|
||||||
|
|
||||||
def ceph_origin_choices(value):
|
def ceph_origin_choices(value):
|
||||||
assert value in ['repository', 'distro', 'local'], "ceph_origin must be either 'repository', 'distro' or 'local'"
|
if not notario_store["containerized_deployment"]:
|
||||||
|
assert value in ['repository', 'distro', 'local'], "ceph_origin must be either 'repository', 'distro' or 'local'"
|
||||||
|
|
||||||
|
|
||||||
def ceph_repository_choices(value):
|
def ceph_repository_choices(value):
|
||||||
|
@ -166,6 +168,7 @@ def validate_rados_options(value):
|
||||||
|
|
||||||
install_options = (
|
install_options = (
|
||||||
("ceph_origin", ceph_origin_choices),
|
("ceph_origin", ceph_origin_choices),
|
||||||
|
("containerized_deployment", types.boolean),
|
||||||
('osd_objectstore', osd_objectstore_choices),
|
('osd_objectstore', osd_objectstore_choices),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- name: validate provided configuration
|
- name: validate provided configuration
|
||||||
validate:
|
validate:
|
||||||
mode: strict
|
mode: strict
|
||||||
|
|
Loading…
Reference in New Issue