validate: add support for containerized_deployment

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py
index 46eedb2b9efe24f8148af6c8a57edcd38f7f77fb..f1b71b2851a13fafbf2d20c69f8da85eb7441051 100644 (file)
--- a/plugins/actions/validate.py
+++ b/plugins/actions/validate.py
@@ -36,6 +36,7 @@ class ActionModule(ActionBase):
 
         try:
             notario_store["groups"] = host_vars["groups"]
+            notario_store["containerized_deployment"] = host_vars["containerized_deployment"]
             notario.validate(host_vars, install_options, defined_keys=True)
 
             if host_vars["ceph_origin"] == "repository":
@@ -108,7 +109,8 @@ def osd_objectstore_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):
@@ -166,6 +168,7 @@ def validate_rados_options(value):
 
 install_options = (
     ("ceph_origin", ceph_origin_choices),
+    ("containerized_deployment", types.boolean),
     ('osd_objectstore', osd_objectstore_choices),
 )
 

diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
index 081617cd6843866b8f801ae8fe9f395a9bc58ac5..98174882e708b9b48f02e6e4dcb910762a127fc4 100644 (file)
--- a/roles/ceph-validate/tasks/main.yml
+++ b/roles/ceph-validate/tasks/main.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: validate provided configuration
   validate:
     mode: strict