From 974ba533177ab0d1d6bb89aba988283273d43eab Mon Sep 17 00:00:00 2001
From: Xicheng Chang <xicheng.chang@huawei.com>
Date: Thu, 29 Dec 2016 16:55:01 -0800
Subject: [PATCH] Fix a few bugs:

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
---
 install/install.conf           |  2 ++
 install/prepare.sh             | 10 +++++++++-
 install/standalone_server.conf |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/install/install.conf b/install/install.conf
index c8f34c65..89371a05 100755
--- a/install/install.conf
+++ b/install/install.conf
@@ -9,6 +9,8 @@ export USER_EMAIL="test@huawei.com"
 export USER_PASSWORD=
 # Compass Server Address, required if installing agent
 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'.
 export OS_INSTALLER="cobbler"
 
diff --git a/install/prepare.sh b/install/prepare.sh
index 69eddcad..36329b4c 100755
--- a/install/prepare.sh
+++ b/install/prepare.sh
@@ -178,7 +178,15 @@ if [ -z $ADAPTERS_SOURCE ]; then
     echo "adpaters source $ADAPTERS_SOURCE is not set"
     exit 1
 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
     echo "download tempest packages"
diff --git a/install/standalone_server.conf b/install/standalone_server.conf
index 47808971..3e5abfff 100755
--- a/install/standalone_server.conf
+++ b/install/standalone_server.conf
@@ -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 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
 export WEB_HOME="/tmp/web"