x/compass-core
Code Issues Proposed changes

Change the way to get controller IP for scp

Browse Source 
In HA scenario, endpoint ip is HA VIP instead of real
controller's IP, causing scp openrc to fail.

Change-Id: I723c138710041cd7c3bae4fed6781bddc0e1cc9d
This commit is contained in:
zhaoxinyu 2014-04-08 02:56:33 +00:00
parent a60b5d2ccd
commit 5f304d4a1f
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install/dependency.sh
View File

@ -19,7 +19,6 @@ fi
if [ "$tempest" == "true" ]; then if [ "$tempest" == "true" ]; then
sudo pip install -U setuptools sudo pip install -U setuptools
sudo pip install -U setuptools sudo pip install -U setuptools
sudo pip install -U shyaml
fi fi
sudo pip install -r $COMPASSDIR/requirements.txt sudo pip install -r $COMPASSDIR/requirements.txt
sudo pip install -r $COMPASSDIR/test-requirements.txt sudo pip install -r $COMPASSDIR/test-requirements.txt

3
misc/ci/tempest_run.sh
View File

@ -45,7 +45,6 @@ pip install tox==1.6.1
#Install setuptools twice so that it is really upgraded #Install setuptools twice so that it is really upgraded
pip install -U setuptools pip install -U setuptools
pip install -U setuptools pip install -U setuptools
pip install shyaml
yum install -y libxml2-devel libxslt-devel python-devel sshpass yum install -y libxml2-devel libxslt-devel python-devel sshpass
if [[ ! -e /tmp/tempest ]]; then if [[ ! -e /tmp/tempest ]]; then
git clone http://git.openstack.org/openstack/tempest /tmp/tempest git clone http://git.openstack.org/openstack/tempest /tmp/tempest
@ -67,7 +66,7 @@ if [[ ! -e /etc/tempest ]]; then
fi fi
#Initialize cloud environment for test and Tempest config file #Initialize cloud environment for test and Tempest config file
cp etc/tempest.conf.sample /etc/tempest/tempest.conf cp etc/tempest.conf.sample /etc/tempest/tempest.conf
nova_api_host=`knife data bag show openstack openstack_1 | shyaml get-value endpoints.compute.service.host` nova_api_host=`knife data bag show openstack openstack_1|grep management_ip |head -1 |awk '{print$2}'`
sshpass -p 'root' scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -r root@$nova_api_host:/root/openrc /root/. sshpass -p 'root' scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -r root@$nova_api_host:/root/openrc /root/.
source /root/openrc source /root/openrc
demo_tenant_id=`keystone tenant-create --name demo |grep " id " |awk '{print $4}'` demo_tenant_id=`keystone tenant-create --name demo |grep " id " |awk '{print $4}'`