Browse Source

- s3 variables check as part of importing the s3 tasks itself.

Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>
Saravanakumar Arumugam 6 years ago
parent
commit
22935acc0f
1 changed files with 5 additions and 7 deletions
  1. 5 7
      roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml

+ 5 - 7
roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml

@@ -110,11 +110,9 @@
 - import_tasks: glusterblock_storageclass.yml
   when: glusterfs_block_storageclass
 
-- name: Check if gluster-s3 can't be deployed
-  set_fact:
-    glusterfs_s3_deploy: False
-  when:
-  - "glusterfs_s3_account is not defined or glusterfs_s3_user is not defined or glusterfs_s3_password is not defined"
-
 - import_tasks: gluster_s3_deploy.yml
-  when: glusterfs_s3_deploy
+  when:
+  - glusterfs_s3_deploy
+  - glusterfs_s3_account is defined
+  - glusterfs_s3_user is defined
+  - glusterfs_s3_password is defined