From 0de559c8f2fd310fe36047ae000574229b7858c9 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Tue, 28 Nov 2017 21:03:25 -0500
Subject: Fix hosted vars

Remove hosted vars from openshift_facts.

The current pattern is causing a bunch of undesired sideffects.
---
 playbooks/openshift-glusterfs/private/registry.yml | 31 +---------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'playbooks/openshift-glusterfs')

diff --git a/playbooks/openshift-glusterfs/private/registry.yml b/playbooks/openshift-glusterfs/private/registry.yml
index 75c1f0300..917b729f9 100644
--- a/playbooks/openshift-glusterfs/private/registry.yml
+++ b/playbooks/openshift-glusterfs/private/registry.yml
@@ -1,40 +1,11 @@
 ---
 - import_playbook: config.yml
 
-- name: Initialize GlusterFS registry PV and PVC vars
-  hosts: oo_first_master
-  tags: hosted
-  tasks:
-  - set_fact:
-      glusterfs_pv: []
-      glusterfs_pvc: []
-
-  - set_fact:
-      glusterfs_pv:
-      - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-volume"
-        capacity: "{{ openshift.hosted.registry.storage.volume.size }}"
-        access_modes: "{{ openshift.hosted.registry.storage.access.modes }}"
-        storage:
-          glusterfs:
-            endpoints: "{{ openshift.hosted.registry.storage.glusterfs.endpoints }}"
-            path: "{{ openshift.hosted.registry.storage.glusterfs.path }}"
-            readOnly: "{{ openshift.hosted.registry.storage.glusterfs.readOnly }}"
-      glusterfs_pvc:
-      - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-claim"
-        capacity: "{{ openshift.hosted.registry.storage.volume.size }}"
-        access_modes: "{{ openshift.hosted.registry.storage.access.modes }}"
-    when: openshift.hosted.registry.storage.glusterfs.swap
-
 - name: Create persistent volumes
   hosts: oo_first_master
-  tags:
-  - hosted
-  vars:
-    persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups, glusterfs_pv) }}"
-    persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims(glusterfs_pvc) }}"
   roles:
   - role: openshift_persistent_volumes
-    when: persistent_volumes | union(glusterfs_pv) | length > 0 or persistent_volume_claims | union(glusterfs_pvc) | length > 0
+    when: openshift_hosted_registry_storage_glusterfs_swap | default(False)
 
 - name: Create Hosted Resources
   hosts: oo_first_master
-- 
cgit v1.2.1