diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-28 21:03:25 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-05 09:40:51 -0500 |
| commit | 0de559c8f2fd310fe36047ae000574229b7858c9 (patch) | |
| tree | dcc495513f182308f7266a94a951b99d58f761d2 /playbooks/openshift-glusterfs/private/registry.yml | |
| parent | 351785e4c44101fb109f03ac4aedbddd86faaa72 (diff) | |
| download | openshift-0de559c8f2fd310fe36047ae000574229b7858c9.tar.gz openshift-0de559c8f2fd310fe36047ae000574229b7858c9.tar.bz2 openshift-0de559c8f2fd310fe36047ae000574229b7858c9.tar.xz openshift-0de559c8f2fd310fe36047ae000574229b7858c9.zip | |
Fix hosted vars
Remove hosted vars from openshift_facts.
The current pattern is causing a bunch of undesired sideffects.
Diffstat (limited to 'playbooks/openshift-glusterfs/private/registry.yml')
| -rw-r--r-- | playbooks/openshift-glusterfs/private/registry.yml | 31 |
1 files changed, 1 insertions, 30 deletions
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 |