From 2f2971ba625776439634dfae32edef606da6d745 Mon Sep 17 00:00:00 2001
From: yatinkarel <yatin.karel@nectechnologies.in>
Date: Tue, 5 Jul 2016 13:12:29 +0530
Subject: [PATCH] Move Initialization of variables inside if/else

Initialization of variables: KUBE_PROTOCOL and KUBE_CONFIG is
done inside if/else for better readability and maintainability.

Change-Id: I37dfe57cc1328f1531233d11667a020bb3e0de5b
Partial-Bug: #1500850
---
 .../kubernetes/fragments/configure-kubernetes-minion.sh      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/magnum/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/templates/kubernetes/fragments/configure-kubernetes-minion.sh
index 942e54360b..9801de2643 100644
--- a/magnum/templates/kubernetes/fragments/configure-kubernetes-minion.sh
+++ b/magnum/templates/kubernetes/fragments/configure-kubernetes-minion.sh
@@ -5,11 +5,12 @@
 echo "configuring kubernetes (minion)"
 
 ETCD_SERVER_IP=${ETCD_SERVER_IP:-$KUBE_MASTER_IP}
-KUBE_PROTOCOL="https"
-KUBE_CONFIG=""
+
 if [ "$TLS_DISABLED" = "True" ]; then
     KUBE_PROTOCOL="http"
+    KUBE_CONFIG=""
 else
+    KUBE_PROTOCOL="https"
     KUBE_CONFIG="--kubeconfig=/srv/kubernetes/kubeconfig.yaml"
 fi
 KUBE_MASTER_URI="$KUBE_PROTOCOL://$KUBE_MASTER_IP:$KUBE_API_PORT"