Merge pull request #8885 from jarrpa/gluster-reg-fix

GlusterFS: Fix registry.yml playbook

playbooks/openshift-glusterfs/private/registry.yml

@@ -9,9 +9,11 @@
   hosts: oo_first_master
   roles:
   - role: openshift_persistent_volumes
-    when: openshift_hosted_registry_storage_glusterfs_swap | default(False)
+    when:
+    - openshift_hosted_registry_storage_kind | default(none) == 'glusterfs' or openshift_hosted_registry_storage_glusterfs_swap
 
-- name: Create Hosted Resources
-  hosts: oo_first_master
-  roles:
-  - role: openshift_hosted
+- import_playbook: ../../openshift-hosted/private/openshift_hosted_registry.yml
+
+- import_playbook: ../../openshift-hosted/private/openshift_hosted_wait_for_pods.yml
+
+- import_playbook: ../../openshift-hosted/private/openshift_hosted_registry_storage.yml