Skip to content
This repository has been archived by the owner on Jul 7, 2020. It is now read-only.

Commit

Permalink
Merge pull request #325 from jarrpa/heketi-cli-fix
Browse files Browse the repository at this point in the history
gk-deploy: Change container directory of heketi-storage.json
  • Loading branch information
humblec authored Aug 24, 2017
2 parents 8a8086d + 65cf364 commit ae3f004
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions deploy/gk-deploy
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ if [[ ${EXISTS_DEPLOY_HEKETI} -eq 1 ]] && [[ ${EXISTS_HEKETI} -eq 0 ]]; then
fi

if [[ $("${heketi_cli}" volume list 2>&1) != *heketidbstorage* ]]; then
eval_output "${heketi_cli} setup-openshift-heketi-storage 2>&1"
eval_output "${heketi_cli} setup-openshift-heketi-storage --listfile=/tmp/heketi-storage.json 2>&1"
if [[ ${?} != 0 ]]; then
output "Failed on setup openshift heketi storage"
output "This may indicate that the storage must be wiped and the GlusterFS nodes must be reset."
Expand All @@ -756,7 +756,7 @@ if [[ ${EXISTS_DEPLOY_HEKETI} -eq 1 ]] && [[ ${EXISTS_HEKETI} -eq 0 ]]; then
exit 1
fi

eval_output "${CLI} exec -it ${heketi_pod} -- cat heketi-storage.json | ${CLI} create -f - 2>&1"
eval_output "${CLI} exec -it ${heketi_pod} -- cat /tmp/heketi-storage.json | ${CLI} create -f - 2>&1"
if [[ ${?} != 0 ]]; then
output "Failed on creating heketi storage resources."
exit 1
Expand Down

0 comments on commit ae3f004

Please sign in to comment.