diff --git a/install/install.conf b/install/install.conf index 754b2577..685f22c2 100755 --- a/install/install.conf +++ b/install/install.conf @@ -24,7 +24,6 @@ export NEXTSERVER=${NEXTSERVER:-} # the domains covered by nameserver export NAMESERVER_DOMAINS=${NAMESERVER_DOMAINS:-} -export REPO_URL=${REPO_URL:-"https://github.com"} # set the default cobbler user "cobbler" password, if not set, the default will be cobbler/cobbler export CBLR_USER=${CBLR_USER:-} export CBLR_PASSWD=${CBLR_PASSWD:-} diff --git a/install/install.conf.template b/install/install.conf.template index 3c2900a2..5ddfb8f2 100755 --- a/install/install.conf.template +++ b/install/install.conf.template @@ -2,7 +2,7 @@ # Config File for Compass Installer # ##################################### # REPO_URL indicates the source where to download compass-web and compass-adapters from -export REPO_URL=https://review.openstack.org +#export REPO_URL=https://review.openstack.org # OS_INSTALLER indicates the tool for OS provisioning, default is 'cobbler'. export OS_INSTALLER=cobbler @@ -53,8 +53,8 @@ export CHEF_PASSWD=root1234 # Set Compass-web and Compass-adpater variables export WEB_HOME=${WEB_HOME:='/tmp/web'} export ADAPTER_HOME=${ADAPTER_HOME:-'/tmp/adapter'} -export WEB_SOURCE=${WEB_SOURCE:-${REPO_URL}'/stackforge/compass-web'} -export ADAPTER_SOURCE=${ADAPTER_SOURCE:-${REPO_URL}'/stackforge/compass-adapters'} +export WEB_SOURCE=${WEB_SOURCE:-'compass-web'} +export ADAPTER_SOURCE=${ADAPTER_SOURCE:-'compass-adapters'} export SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) export COMPASSDIR=${SCRIPT_DIR}/.. diff --git a/install/prepare.sh b/install/prepare.sh index a0f77739..e4cef4a9 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -3,29 +3,36 @@ copygit2dir() { - repo=$1 + project=$1 destdir=$2 + if [ -z "$REPO_URL" ];then + git_repo=http://git.openstack.org/stackforge/$project + gerrit_repo=https://review.openstack.org/stackforge/$project + else + git_repo=$REPO_URL/stackforge/$project + gerrit_repo=$REPO_URL/stackforge/$project + fi if [ -d $destdir ];then echo "$destdir exists" cd $destdir - git remote set-url origin $repo + git remote set-url origin $git_repo git remote update git reset --hard git clean -x -f git checkout master git reset --hard remotes/origin/master if [[ -n "$GERRIT_REFSPEC" ]];then - git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD + git fetch $gerrit_repo $GERRIT_REFSPEC && git checkout FETCH_HEAD fi git clean -x -f else echo "create $destdir" mkdir -p $destdir - git clone $repo $destdir + git clone $git_repo $destdir if [[ -n "$GERRIT_REFSPEC" ]];then # project=$(echo $repo|rev|cut -d '/' -f 1|rev) cd $destdir - git fetch $repo $GERRIT_REFSPEC && git checkout FETCH_HEAD + git fetch $gerrit_repo $GERRIT_REFSPEC && git checkout FETCH_HEAD fi fi cd $SCRIPT_DIR @@ -109,8 +116,8 @@ fi cd $SCRIPT_DIR if [ "$source" != "local" ]; then - copygit2dir $WEB_SOURCE $WEB_HOME - copygit2dir $ADAPTER_SOURCE $ADAPTER_HOME + copygit2dir compass-web $WEB_HOME + copygit2dir compass-adapters $ADAPTER_HOME else copylocal2dir $WEB_SOURCE $WEB_HOME copylocal2dir $ADAPTER_SOURCE $ADAPTER_HOME