x/compass-core
Code Issues Proposed changes

Don't start tempest before nova-compute is ready

Browse Source 
If nova-compute and nova-conductor are on different nodes
and n-compute is up before n-conductor, n-compute will retry
to register health but there will be increasing wait time
between retries, so make sure n-conduct sees available compute
nodes before starting tempest.
also added a parent http proxy to speed up installation and
a dependency for tempest.

Change-Id: Ica46c66bc8b7589915490555d86674eb49c0db1c
This commit is contained in:
zhaoxinyu 2014-04-17 02:04:16 +00:00
parent 1adc10c922
commit a5867abbc6
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/dependency.sh
View File

@ -4,7 +4,7 @@ echo 'Installing Required packages for Compass...'
sudo yum clean all
sudo yum update -y --skip-broken
if [ "$tempest" == "true" ]; then
sudo yum install -y virt-install libvirt qemu-kvm libxml2-devel libxslt-devel python-devel sshpass openssl-devel
sudo yum install -y virt-install libvirt qemu-kvm libxml2-devel libffi-devel libxslt-devel python-devel sshpass openssl-devel
fi
sudo yum install -y rsyslog logrotate ntp iproute openssh-clients python python-devel git wget python-setuptools syslinux python-netaddr python-flask python-flask-sqlalchemy python-amqplib amqp python-paramiko python-mock mod_wsgi httpd squid dhcp bind rsync yum-utils xinetd tftp-server gcc net-snmp-utils net-snmp net-snmp-python python-daemon unzip openssl openssl098e ca-certificates redis python-redis --skip-broken
if [[ "$?" != "0" ]]; then

1
misc/ci/prepare_node_compass.sh
View File

@ -5,6 +5,7 @@ sed -i "s/Defaults requiretty/#Defaults requiretty/" /etc/sudoers
git clone http://git.openstack.org/stackforge/compass-core
cd compass-core
source install/install.conf.template
source install/install.conf
export tempest=true
source install/dependency.sh
source install/prepare.sh

5
misc/ci/tempest_run.sh
View File

@ -96,7 +96,10 @@ iniset /etc/tempest/tempest.conf network public_network_id $public_net_id
iniset /etc/tempest/tempest.conf network public_router_id ''
iniset /etc/tempest/tempest.conf network quantum_available true
iniset /etc/tempest/tempest.conf network tenant_network_cidr '172.16.2.128/25'
# wait for nova-compute to report health to nova-conductor
# In some scenarios, nova-compute is up before conductor and has to retry
# to register to conductor and there is some wait time between retries.
timeout 180s sh -c "while ! nova service-list |grep nova-compute; do sleep 3; done"
#Start a smoke test against cloud without object storage and aws related tests
#as they are unavailable for now
if [[ $tempest_full == true ]]; then

2
misc/ci/test-install.sh
View File

@ -14,4 +14,6 @@ else
fi
source compass-core/install/install.conf.template
/bin/bash -x compass-core/install/install.sh
echo "cache_peer 10.145.81.137 parent 3128 3130 default" >> /etc/squid/squid.conf
service squid restart
sleep 5