diff --git a/install/chef.sh b/install/chef.sh index 5bbfba89..91582f83 100755 --- a/install/chef.sh +++ b/install/chef.sh @@ -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" diff --git a/install/install.conf b/install/install.conf index 1e022c85..c0c48be0 100755 --- a/install/install.conf +++ b/install/install.conf @@ -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} diff --git a/install/install.conf.template b/install/install.conf.template index 9344c0dd..df3c9d14 100755 --- a/install/install.conf.template +++ b/install/install.conf.template @@ -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