]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
validate: do not validate ceph_repository if deploying containers
authorAndrew Schoen <aschoen@redhat.com>
Wed, 31 Oct 2018 15:25:26 +0000 (10:25 -0500)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Fri, 9 Nov 2018 15:14:40 +0000 (15:14 +0000)
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1630975
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 9cd8ecf0cc74e5edfe54cbb5cebf1d72ca3bab8a)

plugins/actions/validate.py

index e6e40f9fe671433db240d4f8e7dc4e1203004ee4..552c55b1c6fa7d9d57bae275141357dbd41ba19a 100644 (file)
@@ -48,7 +48,7 @@ class ActionModule(ActionBase):
             notario_store["containerized_deployment"] = host_vars["containerized_deployment"]
             notario.validate(host_vars, install_options, defined_keys=True)
 
-            if host_vars["ceph_origin"] == "repository":
+            if host_vars["ceph_origin"] == "repository" and not host_vars["containerized_deployment"]:
                 notario.validate(host_vars, ceph_origin_repository, defined_keys=True)
 
                 if host_vars["ceph_repository"] == "community":