From f19ab1416cef83bb34061c309f5d8df4d546aeae Mon Sep 17 00:00:00 2001
From: Denis Poisson <denis.poisson@ts.fujitsu.com>
Date: Mon, 23 Oct 2017 10:39:25 +0200
Subject: [PATCH] Fix some linter warnings, part 13

---
 monasca-forwarder/start.sh  |  3 +--
 monasca-log-agent/build.yml |  2 +-
 monasca-log-agent/start.sh  | 26 +++++++++++++-------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/monasca-forwarder/start.sh b/monasca-forwarder/start.sh
index 43e6a3d68..086a89241 100755
--- a/monasca-forwarder/start.sh
+++ b/monasca-forwarder/start.sh
@@ -9,8 +9,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   success="false"
 
   for i in $(seq "$KAFKA_WAIT_RETRIES"); do
-    python /kafka_wait_for_topics.py
-    if [ $? -eq 0 ]; then
+    if python /kafka_wait_for_topics.py; then
       success="true"
       break
     else
diff --git a/monasca-log-agent/build.yml b/monasca-log-agent/build.yml
index f846185cc..9d443acb8 100644
--- a/monasca-log-agent/build.yml
+++ b/monasca-log-agent/build.yml
@@ -1,6 +1,6 @@
 repository: monasca/log-agent
 variants:
-  - tag: 0.0.2
+  - tag: 0.0.3
     aliases:
       - :latest
     args:
diff --git a/monasca-log-agent/start.sh b/monasca-log-agent/start.sh
index 2ab79c1f1..644650de6 100755
--- a/monasca-log-agent/start.sh
+++ b/monasca-log-agent/start.sh
@@ -10,7 +10,7 @@ wait_for_log_api() {
   if [ "$1" = "true" ]; then
     echo "Waiting for Monasca Log API to become available..."
 
-    for i in $(seq $MONASCA_LOG_API_WAIT_RETRIES); do
+    for i in $(seq "$MONASCA_LOG_API_WAIT_RETRIES"); do
       curl --silent --show-error --output - \
         "${MONASCA_LOG_API_URL}"/healthcheck 2>&1 && return
 
@@ -30,20 +30,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"
@@ -55,8 +55,8 @@ wait_for_keystone() {
   fi
 }
 
-wait_for_log_api $MONASCA_WAIT_FOR_LOG_API
-wait_for_keystone $MONASCA_WAIT_FOR_KEYSTONE
+wait_for_log_api "$MONASCA_WAIT_FOR_LOG_API"
+wait_for_keystone "$MONASCA_WAIT_FOR_KEYSTONE"
 
 /p2 -t /monasca-log-agent.conf.j2 > /monasca-log-agent.conf