Merge "Devstack - use Neutron branch for related projects"

This commit is contained in:
Zuul 2019-05-29 15:18:52 +00:00 committed by Gerrit Code Review
commit c696ef4d68

View File

@ -43,7 +43,7 @@ function install_neutron_projects {
elif use_library_from_git $pkg; then elif use_library_from_git $pkg; then
echo "Project $pkg enabled explicitly from LIBS_FROM_GIT" echo "Project $pkg enabled explicitly from LIBS_FROM_GIT"
else else
sudo pip install -e "git+https://git.openstack.org/openstack/${pkg}#egg=${pkg_renamed}" sudo pip install -e "git+https://git.openstack.org/openstack/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}"
sudo chown -R ${USER}:${USER} src/${pkg} sudo chown -R ${USER}:${USER} src/${pkg}
fi fi
done done
@ -54,7 +54,7 @@ function install_neutron_projects {
if is_service_enabled neutron; then if is_service_enabled neutron; then
echo "service Neutron is enabled explicitly by devstack" echo "service Neutron is enabled explicitly by devstack"
else else
sudo pip install -e "git+https://git.openstack.org/openstack/neutron#egg=neutron" sudo pip install -e "git+https://git.openstack.org/openstack/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}"
sudo chown -R ${USER}:${USER} src/neutron sudo chown -R ${USER}:${USER} src/neutron
fi fi
} }