From 47a28f09af5d8174509d0c78f42ad8f32a53c5ee Mon Sep 17 00:00:00 2001
From: "qiwei.li" <hitliqiwei@gmail.com>
Date: Wed, 4 Jan 2017 19:35:34 -0500
Subject: [PATCH] Fix a few bugs:

Fix bug in compass.sh to have api server correctly assigend
Fix bug in install.conf to change adapter home and dest path
Fix bug in prepare.sh to assign adapter path corresponded

Change-Id: I984c888b057c771188c6c3155162e549b7a9b61e
---
 install/compass.sh   | 2 +-
 install/install.conf | 3 ++-
 install/prepare.sh   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/compass.sh b/install/compass.sh
index a4950768..746bc5ee 100755
--- a/install/compass.sh
+++ b/install/compass.sh
@@ -96,7 +96,7 @@ sudo sed -i "s/\$domains/$domains/g" /etc/compass/setting
 if [ "$FULL_COMPASS_SERVER" == "true" ]; then
     sudo sed -i "/DATABASE_SERVER =/c\DATABASE_SERVER = '127.0.0.1:3306'" /etc/compass/setting
 else
-    sudo sed -i "/DATABASE_SERVER =/c\DATABASE_SERVER = '\$COMPASS_API_SERVER:3306'" /etc/compass/setting
+    sudo sed -i "/DATABASE_SERVER =/c\DATABASE_SERVER = '$COMPASS_API_SERVER:3306'" /etc/compass/setting
 fi 
 
 sudo sed -i "s/\$cobbler_ip/$IPADDR/g" /etc/compass/os_installer/cobbler.conf
diff --git a/install/install.conf b/install/install.conf
index 89371a05..6cbe6bc7 100755
--- a/install/install.conf
+++ b/install/install.conf
@@ -106,7 +106,8 @@ export CHEF_PASSWD="root1234"
 
 # Set Compass-web and Compass-adpater variables
 export WEB_HOME="/tmp/web"
-export ADAPTERS_HOME="/tmp/adapter"
+export ADAPTERS_HOME="/tmp/adapter/deploy/adapters"
+export ADAPTERS_DEST="/tmp/adapter"
 export WEB_SOURCE=
 export ADAPTERS_SOURCE=
 
diff --git a/install/prepare.sh b/install/prepare.sh
index 36329b4c..76318038 100755
--- a/install/prepare.sh
+++ b/install/prepare.sh
@@ -182,10 +182,10 @@ fi
 
 if [ -z $RELEASE_TAG ]; then
     echo "using HEAD for adapters"
-    git clone "$ADAPTERS_SOURCE" "$ADAPTERS_HOME"
+    git clone "$ADAPTERS_SOURCE" "$ADAPTERS_DEST"
 else
     echo "using tag instead of HEAD as refspec"
-    git clone -b $RELEASE_TAG $ADAPTERS_SOURCE $ADAPTERS_HOME 
+    git clone -b $RELEASE_TAG $ADAPTERS_SOURCE $ADAPTERS_DEST 
 fi
 
 if [ "$tempest" == "true" ]; then