openstack
/
devstack-plugin-amqp1
Code Issues Proposed changes

pyngus 1.3.1+ will auto-install necessary proton dependencies

This commit is contained in:
Kenneth Giusti 2015-06-24 13:54:44 -04:00
parent 70db683a70
commit 0225b75e4a
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devstack/plugin.sh
View File

@ -44,30 +44,13 @@ function _get_amqp1_transport_url {
# install packages necessary for support of the oslo.messaging AMQP
# 1.0 driver
function _install_pyngus {
# TODO(kgiusti) remove this once pyngus is upgraded to support
# auto-loading the proton bits:
if is_fedora; then
install_package qpid-proton-c-devel
install_package python-qpid-proton
else
exit_distro_not_supported "QPID AMQP 1.0 Proton libraries"
fi
# Install pyngus client API
# TODO(kgiusti) enforce minimal version of pyngus
pip_install_gr pyngus
}
# remove packages used by oslo.messaging AMQP 1.0 driver
function _remove_pyngus {
# TODO(kgiusti) remove this once pyngus is upgraded to support
# auto-loading the proton bits:
if is_fedora; then
uninstall_package qpid-proton-c-devel
uninstall_package python-qpid-proton
fi
# TODO(kgiusti) ubuntu cleanup
# TODO(kgiusti) no way to pip uninstall?
# pip_install_gr pyngus
}
@ -173,6 +156,9 @@ function _start_qpid_backend {
function _cleanup_qpid_backend {
if is_fedora; then
uninstall_package qpid-cpp-server
# TODO(kgiusti) can we pull these, or will that break other
# packages that depend on them?
# install_package cyrus_sasl_lib
# install_package cyrus_sasl_plain
elif is_ubuntu; then