openstack
/
neutron
Code Issues Proposed changes

Merge changes If6673e59,I464080e4 into stable/essex 

* changes:
  Bug #1007153
  Bug #994758
This commit is contained in:
Jenkins 2012-06-19 08:30:10 +00:00 committed by Gerrit Code Review
parent 44e85a6aa6 2dc269cb17
commit a90d63cbb0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
quantum/plugins/openvswitch/agent/xenserver_install.sh
View File

@ -7,14 +7,12 @@ if [ ! -d /etc/xapi.d/plugins ]; then
exit 1
fi
# Make sure we have sqlalchemy-python
rpm -qa | grep sqlalchemy-python >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo "sqlalchemy-python not found"
echo "Please enable the centos repositories and install sqlalchemy-python:"
echo "yum --enablerepo=base -y install sqlalchemy-python"
exit 1
fi
rpm -Uvh http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm
yum --enablerepo=epel -y install python-sqlalchemy0.5
yum --enablerepo=base -y install MySQL-python
sed -i 's/enabled=1/enabled=0' /etc/yum.repos.d/epel.repo
cp ovs_quantum_agent.py /etc/xapi.d/plugins
cp ovs_quantum_plugin.ini /etc/xapi.d/plugins