diff options
| author | Jose A. Rivera <jarrpa@redhat.com> | 2017-07-11 15:54:42 -0500 |
|---|---|---|
| committer | Jose A. Rivera <jarrpa@redhat.com> | 2017-07-14 10:37:29 -0500 |
| commit | 0624a1f36583c832b5b2e0c791a6926e56053e3e (patch) | |
| tree | a47f3d15978431a9c3c56022e4f0eb83a8c5e5eb /roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | |
| parent | af667a6cf3befcaf0e6b02f26dbe4106decdafb1 (diff) | |
| download | openshift-0624a1f36583c832b5b2e0c791a6926e56053e3e.tar.gz openshift-0624a1f36583c832b5b2e0c791a6926e56053e3e.tar.bz2 openshift-0624a1f36583c832b5b2e0c791a6926e56053e3e.tar.xz openshift-0624a1f36583c832b5b2e0c791a6926e56053e3e.zip | |
GlusterFS: Bug fixes for external GlusterFS nodes
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml')
| -rw-r--r-- | roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml index 99ad029da..6fc7a256e 100644 --- a/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml +++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_common.yml @@ -173,7 +173,7 @@ - name: Set heketi-cli command set_fact: - glusterfs_heketi_client: "{% if glusterfs_heketi_is_native %}{{ openshift.common.client_binary }} rsh --namespace={{ glusterfs_namespace }} {{ heketi_pod.results.results[0]['items'][0]['metadata']['name'] }} {% endif %}heketi-cli -s http://{% if glusterfs_heketi_is_native %}localhost:8080{% else %}{{ glusterfs_heketi_url }}:{{ glusterfs_heketi_port }}{% endif %} --user admin --secret '{{ glusterfs_heketi_admin_key }}'" + glusterfs_heketi_client: "{% if glusterfs_heketi_is_native %}{{ openshift.common.client_binary }} rsh --namespace={{ glusterfs_namespace }} {{ heketi_pod.results.results[0]['items'][0]['metadata']['name'] }} {% endif %}heketi-cli -s http://{% if glusterfs_heketi_is_native %}localhost:8080{% else %}{{ glusterfs_heketi_url }}:{{ glusterfs_heketi_port }}{% endif %} --user admin {% if glusterfs_heketi_admin_key is defined %}--secret '{{ glusterfs_heketi_admin_key }}'{% endif %}" - name: Verify heketi service command: "{{ glusterfs_heketi_client }} cluster list" @@ -203,6 +203,7 @@ data: "{{ glusterfs_heketi_admin_key }}" when: - glusterfs_storageclass + - glusterfs_heketi_admin_key is defined - name: Get heketi route oc_obj: |