From 02d44874987d6c4bf6beffd5b69bac2522f457a5 Mon Sep 17 00:00:00 2001
From: Nauman_Ahad <nauman_ahad@xflowresearch.com>
Date: Tue, 2 Feb 2016 02:54:48 +0500
Subject: Bug Fixes for SSL index calculation

Index calcuation for SSL caused a ValueError when
converting to float due to the presence of
a trailing "k" character. This has ben resolved.

Change-Id: I6f7d061977a3a8cbc2aa1afe154df5eeec9feac8
Signed-off-by: Nauman_Ahad <nauman_ahad@xflowresearch.com>
(cherry picked from commit cbdddad944abba7be2eb848b16b2abc1ce791f50)
---
 data/qtip_creds.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'data/qtip_creds.sh')

diff --git a/data/qtip_creds.sh b/data/qtip_creds.sh
index 490de859..bcd4c246 100755
--- a/data/qtip_creds.sh
+++ b/data/qtip_creds.sh
@@ -3,21 +3,25 @@
 DEST_IP=$1
 echo $INSTALLER_TYPE
 echo $INSTALLER_IP
-
+sshoptions="-o StrictHostKeyChecking=no"
 case "$INSTALLER_TYPE" in
     apex)
-        PSWD="vagrant";;
+        PSWD="vagrant"
+        ;;
     fuel)
-        PSWD="r00tme";;
+        PSWD="r00tme"
+        sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root
+        sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/root
+        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub"
+        ;;
     compass)
-        PSWD="root";;
+        PSWD="root"
+        sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root
+        sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/root
+        sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub"
+        ;;
     joid)
         PSWD="joid";;
        *)
         echo "Unkown installer $INSTALLER_TYPE specified";;
 esac
-echo $PWD
-sshoptions="-o StrictHostKeyChecking=no"
-sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root
-sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey.pub"
-
-- 
cgit 1.2.3-korg