x/compass-core
Code Issues Proposed changes

Fix a syntax error in prepare.sh

Browse Source 
Change-Id: I609525baf8559252fe534ce6367896d5991f66fc
This commit is contained in:
Xicheng Chang 2015-06-18 17:41:09 -07:00
parent 609db48197
commit 8cc9b72e83
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/chef.sh
View File

@ -90,8 +90,8 @@ 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
if [ "$REGTEST" = true ]; then
sed -i '/compass-rally/d' /var/chef/roles/os-identity.json
fi
knife role from file /var/chef/roles/*.json
if [[ "$?" != "0" ]]; then

1
install/install.conf
View File

@ -1,7 +1,6 @@
#####################################
# 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,8 +1,6 @@
#####################################
# 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

5
regtest/ansible/ci/deploy-vm.sh
View File

@ -1,7 +1,4 @@
cd ..
rm -rf compass-core
git clone http://git.openstack.org/stackforge/compass-core -b dev/experimental
cd compass-core
cd ../..
virtualenv venv
source venv/bin/activate
pip install -e .

1
regtest/ansible/ci/prepare.sh
View File

@ -33,6 +33,7 @@ if [[ $? != 0 ]]; then
else
wget ${centos65_box_vb_url}
mv ${centos65_box_vb_filename} centos65.box
fi
vagrant mutate centos65.box libvirt
else
echo "centos65 box already exists"

12
regtest/ansible/ci/setup-env.sh
View File

@ -3,7 +3,8 @@
#cd compass-install
function join { local IFS="$1"; shift; echo "$*"; }
source ${SCRIPT_DIR}/conf/one.conf
REGTEST_CONF=${REGTEST_CONF:-"allinone.conf"}
source ${SCRIPT_DIR}/conf/${REGTEST_CONF}
source ${SCRIPT_DIR}/func.sh
if [[ ! -z $VIRT_NUMBER ]]; then
mac_array=$(${SCRIPT_DIR}/mac_generator.sh $VIRT_NUMBER)
@ -12,6 +13,7 @@ if [[ ! -z $VIRT_NUMBER ]]; then
echo "test: true" >> ${SCRIPT_DIR}/../install/group_vars/all
fi
virsh list |grep compass_nodocker
cd ${SCRIPT_DIR}/..
if [[ $? != 0 ]]; then
sudo vagrant up compass_nodocker
else
@ -34,10 +36,10 @@ if [[ -n $mac_array ]]; then
sudo virt-install --accelerate --hvm --connect qemu:///system \
--name pxe$i --ram=$VIRT_MEM --pxe --disk /home/pxe$i.raw,format=raw \
--vcpus=$VIRT_CPUS --graphics vnc,listen=0.0.0.0 \
--network=bridge:virbr2,mac=$mac \
--network=bridge:virbr2 \
--network=bridge:virbr2 \
--network=bridge:virbr2 \
--network=bridge:installation,mac=$mac \
--network=bridge:installation \
--network=bridge:installation \
--network=bridge:installation \
--noautoconsole --autostart --os-type=linux --os-variant=rhel6
if [[ $? != 0 ]]; then
echo "launching pxe${i} failed"