diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-19 13:19:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 13:19:40 -0400 |
| commit | 326d8e530db5f0cfcbc1a77451150699063e900e (patch) | |
| tree | cf25b17eb27b7cab361e84c02b3eb4445521e374 /roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml | |
| parent | f6de39e8f38d77565481bc9709ec0be5d9d4c6ab (diff) | |
| parent | b1c40b3dbbc7cfbf9ed0f6f657a68b4ea6a53136 (diff) | |
| download | openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.gz openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.bz2 openshift-326d8e530db5f0cfcbc1a77451150699063e900e.tar.xz openshift-326d8e530db5f0cfcbc1a77451150699063e900e.zip | |
Merge pull request #4484 from jarrpa/glusterfs-fixes-too
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml')
| -rw-r--r-- | roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml index 3a9619d9d..26343b909 100644 --- a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml +++ b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml @@ -103,6 +103,7 @@ params: IMAGE_NAME: "{{ glusterfs_heketi_image }}" IMAGE_VERSION: "{{ glusterfs_heketi_version }}" + HEKETI_ROUTE: "{{ glusterfs_heketi_url | default(['heketi-',glusterfs_name]|join) }}" HEKETI_USER_KEY: "{{ glusterfs_heketi_user_key }}" HEKETI_ADMIN_KEY: "{{ glusterfs_heketi_admin_key }}" HEKETI_KUBE_NAMESPACE: "{{ glusterfs_namespace }}" @@ -124,7 +125,7 @@ - name: Set heketi-cli command set_fact: - glusterfs_heketi_client: "{% if glusterfs_heketi_is_native %}oc rsh {{ heketi_pod.results.results[0]['items'][0]['metadata']['name'] }} {% endif %}heketi-cli -s http://localhost:8080 --user admin --secret '{{ glusterfs_heketi_admin_key }}'" + glusterfs_heketi_client: "oc rsh {{ heketi_pod.results.results[0]['items'][0]['metadata']['name'] }} heketi-cli -s http://localhost:8080 --user admin --secret '{{ glusterfs_heketi_admin_key }}'" - name: Verify heketi service command: "{{ glusterfs_heketi_client }} cluster list" |