x/compass-core
Code Issues Proposed changes

Fix a few bugs:

Browse Source 
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
This commit is contained in:
qiwei.li 2017-01-04 19:35:34 -05:00
parent 09f8fb14aa
commit 47a28f09af
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/compass.sh
View File

@ -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

3
install/install.conf
View File

@ -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=

4
install/prepare.sh
View File

@ -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