GlusterFS: Adjust when clauses for registry config

Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>

roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml

@@ -21,7 +21,7 @@
 
 - include: glusterfs_common.yml
   when:
-  - "'glusterfs_registry' in groups"
+  - groups.glusterfs_registry | default([]) | count > 0
   - "'glusterfs' not in groups or groups.glusterfs_registry != groups.glusterfs"
 
 - name: Delete pre-existing GlusterFS registry resources

roles/openshift_storage_glusterfs/tasks/main.yml

@@ -11,8 +11,7 @@
 
 - include: glusterfs_registry.yml
   when:
-  - groups.glusterfs_registry | default([]) | count > 0
-  - "openshift.hosted.registry.storage.kind == 'glusterfs' or openshift.hosted.registry.glusterfs.swap"
+  - "groups.glusterfs_registry | default([]) | count > 0 or openshift.hosted.registry.storage.kind == 'glusterfs' or openshift.hosted.registry.glusterfs.swap"
 
 - name: Delete temp directory
   file: