From 4bf8cbe0c897c541c05e03e4691d8a20c5a1662d Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 21 Oct 2019 17:09:31 +0200 Subject: [PATCH] validate: fix credentials validation This task is failing when `ceph_docker_registry_auth` is enabled and `ceph_docker_registry_username` is undefined with an ansible error instead of the expected message. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1763139 Signed-off-by: Guillaume Abrioux (cherry picked from commit da4215e9c055682f1f91552cc40e4fa77a75fc7a) --- roles/ceph-validate/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml index 16d357115..29f3895f9 100644 --- a/roles/ceph-validate/tasks/main.yml +++ b/roles/ceph-validate/tasks/main.yml @@ -205,5 +205,5 @@ msg: 'ceph_docker_registry_username and/or ceph_docker_registry_password variables need to be set' when: - ceph_docker_registry_auth | bool - - (ceph_docker_registry_username is not defined or ceph_docker_registry_password is not defined) - - (ceph_docker_registry_username | length == 0 or ceph_docker_registry_password | length == 0) + - (ceph_docker_registry_username is not defined or ceph_docker_registry_password is not defined) or + (ceph_docker_registry_username | length == 0 or ceph_docker_registry_password | length == 0)