Merge "Use packaged Ovs for fedora 23 and higher"

This commit is contained in:
Jenkins 2016-05-19 10:23:41 +00:00 committed by Gerrit Code Review
commit a0f91eedc5
2 changed files with 5 additions and 1 deletions

View File

@ -1,6 +1,5 @@
#!/bin/bash
OVS_INSTALL_FROM_GIT=${OVS_INSTALL_FROM_GIT:-"True"}
function _neutron_ovs_get_dnf {
if is_fedora; then

View File

@ -18,3 +18,8 @@ DF_Q_SVC_MASTER=${DF_Q_SVC_MASTER:-"True"}
PUBLISHER_RATE_LIMIT_TIMEOUT=${PUBLISHER_RATE_LIMIT_TIMEOUT:-180}
PUBLISHER_RATE_LIMIT_COUNT=${PUBLISHER_RATE_LIMIT_COUNT:-1}
if [ is_fedora -a $os_RELEASE -ge 23 ] ; then
OVS_INSTALL_FROM_GIT=${OVS_INSTALL_FROM_GIT:-"False"}
else
OVS_INSTALL_FROM_GIT=${OVS_INSTALL_FROM_GIT:-"True"}
fi