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

Fix some linter warnings, part 11 #267

Merged
merged 9 commits into from
Oct 20, 2017
Merged

Fix some linter warnings, part 11 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a52660f
Fix some linter warnings, part 11
digitalfishpond Oct 19, 2017
86906a2
Merge branch 'master' into fix-lint-11
kornicameister Oct 20, 2017
d8a5391
Merge branch 'master' into fix-lint-11
digitalfishpond Oct 20, 2017
36aa35c
Merge branch 'master' into fix-lint-11
digitalfishpond Oct 20, 2017
5155ad3
Merge branch 'master' into fix-lint-11
matrixik Oct 20, 2017
b85cf00
Merge branch 'master' into fix-lint-11
digitalfishpond Oct 20, 2017
965bfd8
fix exit code check
digitalfishpond Oct 20, 2017
a32e871
Merge remote-tracking branch 'origin/fix-lint-11' into fix-lint-11
digitalfishpond Oct 20, 2017
c863634
fixing another negative exit code check
digitalfishpond Oct 20, 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
6 changes: 3 additions & 3 deletions monasca-agent-collector/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/ash
# shellcheck shell=dash
# (C) Copyright 2017 Hewlett Packard Enterprise Development LP

set -x
Expand All @@ -9,7 +10,7 @@ USER_PLUGINS="/plugins.d"
AGENT_CONF="/etc/monasca/agent"
AGENT_PLUGINS="$AGENT_CONF/conf.d"

if [ "$KEYSTONE_DEFAULTS_ENABLED" == "true" ]; then
if [ "$KEYSTONE_DEFAULTS_ENABLED" = "true" ]; then
export OS_AUTH_URL=${OS_AUTH_URL:-"http://keystone:35357/v3/"}
export OS_USERNAME=${OS_USERNAME:-"monasca-agent"}
export OS_PASSWORD=${OS_PASSWORD:-"password"}
Expand All @@ -29,8 +30,7 @@ template () {
}

if [ "$HOSTNAME_FROM_KUBERNETES" = "true" ]; then
AGENT_HOSTNAME=$(python /kubernetes_get_host.py)
if [ $? != 0 ]; then
if ! AGENT_HOSTNAME=$(python /kubernetes_get_host.py); then
echo "Error getting hostname from Kubernetes"
return 1
fi
Expand Down
6 changes: 3 additions & 3 deletions monasca-agent-forwarder/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/bin/ash
# shellcheck shell=dash
# (C) Copyright 2017 Hewlett Packard Enterprise Development LP

set -x

AGENT_CONF="/etc/monasca/agent"

if [ "$KEYSTONE_DEFAULTS_ENABLED" == "true" ]; then
if [ "$KEYSTONE_DEFAULTS_ENABLED" = "true" ]; then
export OS_AUTH_URL=${OS_AUTH_URL:-"http://keystone:35357/v3/"}
export OS_USERNAME=${OS_USERNAME:-"monasca-agent"}
export OS_PASSWORD=${OS_PASSWORD:-"password"}
Expand All @@ -23,8 +24,7 @@ template () {
}

if [ "$HOSTNAME_FROM_KUBERNETES" = "true" ]; then
AGENT_HOSTNAME=$(python /kubernetes_get_host.py)
if [ $? != 0 ]; then
if ! AGENT_HOSTNAME=$(python /kubernetes_get_host.py); then
echo "Error getting hostname from Kubernetes"
return 1
fi
Expand Down