diff options
author | Jose A. Rivera <jarrpa@redhat.com> | 2017-08-04 08:01:52 -0500 |
---|---|---|
committer | Jose A. Rivera <jarrpa@redhat.com> | 2017-08-04 08:03:05 -0500 |
commit | c89a8657ef2e7ef2f5c9cd6929225b0adb742dd0 (patch) | |
tree | b1132b1339760e3a032f64740831e24d87024c34 /roles/openshift_storage_glusterfs/defaults | |
parent | 05a9c91735cc95457411dbb19951341e5418df18 (diff) | |
download | openshift-c89a8657ef2e7ef2f5c9cd6929225b0adb742dd0.tar.gz openshift-c89a8657ef2e7ef2f5c9cd6929225b0adb742dd0.tar.bz2 openshift-c89a8657ef2e7ef2f5c9cd6929225b0adb742dd0.tar.xz openshift-c89a8657ef2e7ef2f5c9cd6929225b0adb742dd0.zip |
GlusterFS: Don't use /dev/null for empty file.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1478198
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles/openshift_storage_glusterfs/defaults')
-rw-r--r-- | roles/openshift_storage_glusterfs/defaults/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_storage_glusterfs/defaults/main.yml b/roles/openshift_storage_glusterfs/defaults/main.yml index 2823a7610..ff2c18812 100644 --- a/roles/openshift_storage_glusterfs/defaults/main.yml +++ b/roles/openshift_storage_glusterfs/defaults/main.yml @@ -23,7 +23,7 @@ openshift_storage_glusterfs_heketi_executor: 'kubernetes' openshift_storage_glusterfs_heketi_ssh_port: 22 openshift_storage_glusterfs_heketi_ssh_user: 'root' openshift_storage_glusterfs_heketi_ssh_sudo: False -openshift_storage_glusterfs_heketi_ssh_keyfile: '/dev/null' +openshift_storage_glusterfs_heketi_ssh_keyfile: "{{ omit }}" openshift_storage_glusterfs_namespace: "{{ 'glusterfs' | quote if openshift_storage_glusterfs_is_native or openshift_storage_glusterfs_heketi_is_native else 'default' | quote }}" openshift_storage_glusterfs_registry_timeout: "{{ openshift_storage_glusterfs_timeout }}" @@ -51,4 +51,4 @@ openshift_storage_glusterfs_registry_heketi_executor: "{{ openshift_storage_glus openshift_storage_glusterfs_registry_heketi_ssh_port: "{{ openshift_storage_glusterfs_heketi_ssh_port }}" openshift_storage_glusterfs_registry_heketi_ssh_user: "{{ openshift_storage_glusterfs_heketi_ssh_user }}" openshift_storage_glusterfs_registry_heketi_ssh_sudo: "{{ openshift_storage_glusterfs_heketi_ssh_sudo }}" -openshift_storage_glusterfs_registry_heketi_ssh_keyfile: "{{ openshift_storage_glusterfs_heketi_ssh_keyfile }}" +openshift_storage_glusterfs_registry_heketi_ssh_keyfile: "{{ openshift_storage_glusterfs_heketi_ssh_keyfile | default(omit) }}" |