From a52660ff80f604df825e0c2d4a471cda7920361e Mon Sep 17 00:00:00 2001 From: Denis Poisson Date: Thu, 19 Oct 2017 15:12:20 +0200 Subject: [PATCH 1/2] Fix some linter warnings, part 11 --- monasca-agent-collector/start.sh | 6 +++--- monasca-agent-forwarder/start.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/monasca-agent-collector/start.sh b/monasca-agent-collector/start.sh index becb2240f..145235baa 100755 --- a/monasca-agent-collector/start.sh +++ b/monasca-agent-collector/start.sh @@ -1,4 +1,5 @@ #!/bin/ash +# shellcheck shell=dash # (C) Copyright 2017 Hewlett Packard Enterprise Development LP set -x @@ -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"} @@ -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 diff --git a/monasca-agent-forwarder/start.sh b/monasca-agent-forwarder/start.sh index 5c92ffd43..6dd9fc956 100755 --- a/monasca-agent-forwarder/start.sh +++ b/monasca-agent-forwarder/start.sh @@ -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"} @@ -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 From c863634fd5cb52b1f95f90ed47ef9fc93f10b95d Mon Sep 17 00:00:00 2001 From: Denis Poisson Date: Fri, 20 Oct 2017 13:00:04 +0200 Subject: [PATCH 2/2] fixing another negative exit code check --- monasca-agent-collector/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monasca-agent-collector/start.sh b/monasca-agent-collector/start.sh index 145235baa..6234dea57 100755 --- a/monasca-agent-collector/start.sh +++ b/monasca-agent-collector/start.sh @@ -30,7 +30,7 @@ template () { } if [ "$HOSTNAME_FROM_KUBERNETES" = "true" ]; then - if AGENT_HOSTNAME=$(python /kubernetes_get_host.py); then + if ! AGENT_HOSTNAME=$(python /kubernetes_get_host.py); then echo "Error getting hostname from Kubernetes" return 1 fi