Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some linter warnings, part 19 #295

Merged
merged 3 commits into from
Oct 25, 2017
Merged

Fix some linter warnings, part 19 #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
610849f
Fix some linter warnings, part 19
digitalfishpond Oct 24, 2017
2a70d66
Merge branch 'master' into fix-lint-19
digitalfishpond Oct 24, 2017
43d23f3
Merge branch 'master' into fix-lint-19
digitalfishpond Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions grafana/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh

# shellcheck disable=SC2153
if [ -n "$GF_DATABASE_PORT" ]; then
export GF_DATABASE_HOST=$GF_DATABASE_HOST":"$GF_DATABASE_PORT
fi
Expand Down
21 changes: 11 additions & 10 deletions monasca-log-agent/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
# shellcheck disable=SC2086
# (C) Copyright 2017 FUJITSU LIMITED

MONASCA_LOG_API_WAIT_RETRIES=${MONASCA_LOG_API_WAIT_RETRIES:-"24"}
Expand Down Expand Up @@ -30,20 +31,20 @@ wait_for_keystone() {
for i in $(seq "$KEYSTONE_WAIT_RETRIES"); do
curl --fail --silent --show-error --output - \
-H "Content-Type: application/json" \
-d "
{ \"auth\": {
\"identity\": {
\"methods\": [\"password\"],
\"password\": {
\"user\": {
\"name\": \""$OS_USERNAME"\",
\"domain\": { \"id\": \""$OS_USER_DOMAIN_NAME"\" },
\"password\": \""$OS_PASSWORD"\"
-d '
{ "auth": {
"identity": {
"methods": ["password"],
"password": {
"user": {
"name": "'$OS_USERNAME'",
"domain": { "id": "'$OS_USER_DOMAIN_NAME'" },
"password": "'$OS_PASSWORD'"
}
}
}
}
}" "$OS_AUTH_URL"/auth/tokens 2>&1 && return
}' "$OS_AUTH_URL"/auth/tokens 2>&1 && return

echo "Keystone not yet ready (attempt $i of $KEYSTONE_WAIT_RETRIES)"
sleep "$KEYSTONE_WAIT_DELAY"
Expand Down