summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-18 17:02:26 -0400
committerGitHub <noreply@github.com>2017-07-18 17:02:26 -0400
commitf1711875170934936895fe24ac1f7ab721608c5a (patch)
tree0f1b273920d7a543f1f45a4f3d5c402ee1d4c908 /roles/openshift_hosted/tasks
parent2394c7518aac568ed074d2ea3c2effbb858a7523 (diff)
parent2a0c64c4174dfcc079254d1fe04125ad6adfe038 (diff)
downloadopenshift-f1711875170934936895fe24ac1f7ab721608c5a.tar.gz
openshift-f1711875170934936895fe24ac1f7ab721608c5a.tar.bz2
openshift-f1711875170934936895fe24ac1f7ab721608c5a.tar.xz
openshift-f1711875170934936895fe24ac1f7ab721608c5a.zip
Merge pull request #4769 from jarrpa/glusterfs-fixes-five
GlusterFS fixes 5
Diffstat (limited to 'roles/openshift_hosted/tasks')
-rw-r--r--roles/openshift_hosted/tasks/registry/storage/glusterfs.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_hosted/tasks/registry/storage/glusterfs.yml b/roles/openshift_hosted/tasks/registry/storage/glusterfs.yml
index c504bfb80..c2954fde1 100644
--- a/roles/openshift_hosted/tasks/registry/storage/glusterfs.yml
+++ b/roles/openshift_hosted/tasks/registry/storage/glusterfs.yml
@@ -35,7 +35,7 @@
mount:
state: mounted
fstype: glusterfs
- src: "{% if 'glusterfs_registry' in groups %}{{ groups.glusterfs_registry[0] }}{% else %}{{ groups.glusterfs[0] }}{% endif %}:/{{ openshift.hosted.registry.storage.glusterfs.path }}"
+ src: "{% if 'glusterfs_registry' in groups %}{% set node = groups.glusterfs_registry[0] %}{% else %}{% set node = groups.glusterfs[0] %}{% endif %}{% if 'glusterfs_hostname' in hostvars[node] %}{{ hostvars[node].glusterfs_hostname }}{% elif 'openshift' in hostvars[node] %}{{ hostvars[node].openshift.node.nodename }}{% else %}{{ node }}{% endif %}:/{{ openshift.hosted.registry.storage.glusterfs.path }}"
name: "{{ mktemp.stdout }}"
- name: Set registry volume permissions