diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/openstack-credential-check.yml b/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/openstack-credential-check.yml
index b5a447472..d46bcb626 100644
--- a/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/openstack-credential-check.yml
+++ b/roles/kubernetes-apps/external_cloud_controller/openstack/tasks/openstack-credential-check.yml
@@ -23,12 +23,5 @@
   fail:
     msg: "one of external_openstack_tenant_id or external_openstack_tenant_name must be specified"
   when:
-    - external_openstack_tenant_id is not defined or not external_openstack_tenant_id
-    - external_openstack_tenant_name is not defined
-
-- name: External OpenStack Cloud Controller | check external_openstack_tenant_name value
-  fail:
-    msg: "one of external_openstack_tenant_id or external_openstack_tenant_name must be specified"
-  when:
-    - external_openstack_tenant_name is not defined or not external_openstack_tenant_name
-    - external_openstack_tenant_id is not defined
+    - (external_openstack_tenant_id is not defined or not external_openstack_tenant_id) and
+      (external_openstack_tenant_name is not defined or not external_openstack_tenant_name)