x/compass-core
Code Issues Proposed changes

Fix a few bugs:

Browse Source 
Fix bugs in prepare.sh to have it take release_tag.
Fix mysql variable to the package name instead of the full uri.

Change-Id: I6b64a5613060c07bde0c903d7f30e2433cde2014
This commit is contained in:
Xicheng Chang 2016-12-29 16:55:01 -08:00
parent 7432122eaa
commit 974ba53317
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/install.conf
View File

@ -9,6 +9,8 @@ export USER_EMAIL="test@huawei.com"
export USER_PASSWORD= export USER_PASSWORD=
# Compass Server Address, required if installing agent # Compass Server Address, required if installing agent
export COMPASS_API_SERVER="c.stack360.io" export COMPASS_API_SERVER="c.stack360.io"
# Release tag
export RELEASE_TAG="colorado.3.0"
# OS_INSTALLER indicates the tool for OS provisioning, default is 'cobbler'. # OS_INSTALLER indicates the tool for OS provisioning, default is 'cobbler'.
export OS_INSTALLER="cobbler" export OS_INSTALLER="cobbler"

10
install/prepare.sh
View File

@ -178,7 +178,15 @@ if [ -z $ADAPTERS_SOURCE ]; then
echo "adpaters source $ADAPTERS_SOURCE is not set" echo "adpaters source $ADAPTERS_SOURCE is not set"
exit 1 exit 1
fi fi
copy2dir "$ADAPTERS_SOURCE" "$ADAPTERS_HOME" || exit $? # copy2dir "$ADAPTERS_SOURCE" "$ADAPTERS_HOME" || exit $?
if [ -z $RELEASE_TAG ]; then
echo "using HEAD for adapters"
git clone "$ADAPTERS_SOURCE" "$ADAPTERS_HOME"
else
echo "using tag instead of HEAD as refspec"
git clone -b $RELEASE_TAG $ADAPTERS_SOURCE $ADAPTERS_HOME
fi
if [ "$tempest" == "true" ]; then if [ "$tempest" == "true" ]; then
echo "download tempest packages" echo "download tempest packages"

2
install/standalone_server.conf
View File

@ -5,7 +5,7 @@ export REMI="http://rpms.famillecollet.com/enterprise/remi-release-7.rpm"
export EPEL="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" export EPEL="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
export MYSQL="http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm" export MYSQL="mysql-community-release-el7-5.noarch.rpm"
# Compass web related variables # Compass web related variables
export WEB_HOME="/tmp/web" export WEB_HOME="/tmp/web"