x/compass-core
Code Issues Proposed changes

Merge "Disable rally in CI"

Browse Source
This commit is contained in:
Jenkins 2015-06-19 00:02:56 +00:00 committed by Gerrit Code Review
commit 609db48197
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
install/chef.sh
View File

@ -89,7 +89,10 @@ if [[ "$?" != "0" ]]; then
else
echo "cookbooks are added to chef server"
fi
# disable compass-rally when in regtest
if $REGTEST; then
sed -i '/compass-rally/d' /var/roles/os-identity.json
fi
knife role from file /var/chef/roles/*.json
if [[ "$?" != "0" ]]; then
echo "failed to add roles"

2
install/install.conf
View File

@ -1,7 +1,7 @@
#####################################
# Config File for Compass Installer #
#####################################
export REGTEST="False"
# OS_INSTALLER indicates the tool for OS provisioning, default is 'cobbler'.
export OS_INSTALLER=${OS_INSTALLER:-cobbler}

2
install/install.conf.template
View File

@ -1,6 +1,8 @@
#####################################
# Config File for Compass Installer #
#####################################
# flag for regtest
export REGTEST="True"
# REPO_URL indicates the source where to download compass-web and compass-adapters from
#export REPO_URL=https://review.openstack.org