openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Elasticsearch: Define success criteria for adding snapshot repo"

Browse Source
This commit is contained in:
Zuul 2018-12-12 23:23:48 +00:00 committed by Gerrit Code Review
commit d984f3c782
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
elasticsearch/templates/bin/_register-repository.sh.tpl
View File

@ -20,7 +20,7 @@ limitations under the License.
set -ex set -ex
{{ range $repository := $envAll.Values.conf.elasticsearch.snapshots.repositories }} {{ range $repository := $envAll.Values.conf.elasticsearch.snapshots.repositories }}
curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \ result=$(curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
"${ELASTICSEARCH_HOST}/_snapshot/{{$repository.name}}" \ "${ELASTICSEARCH_HOST}/_snapshot/{{$repository.name}}" \
-H 'Content-Type: application/json' -d' -H 'Content-Type: application/json' -d'
{ {
@ -32,5 +32,12 @@ curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
"access_key": "'"$S3_ACCESS_KEY"'", "access_key": "'"$S3_ACCESS_KEY"'",
"secret_key": "'"$S3_SECRET_KEY"'" "secret_key": "'"$S3_SECRET_KEY"'"
} }
}' }' | python -c "import sys, json; print json.load(sys.stdin)['acknowledged']")
if [ "$result" == "True" ];
then
echo "Snapshot repository {{$repository.name}} created!";
else
echo "Snapshot repository {{$repository.name}} not created!";
exit 1;
fi
{{ end }} {{ end }}