Browse Source

pyngus 1.3.1+ will auto-install necessary proton dependencies

Kenneth Giusti 3 years ago
parent
commit
0225b75e4a
1 changed files with 3 additions and 17 deletions
  1. 3
    17
      devstack/plugin.sh

+ 3
- 17
devstack/plugin.sh View File

@@ -44,30 +44,13 @@ function _get_amqp1_transport_url {
44 44
 # install packages necessary for support of the oslo.messaging AMQP
45 45
 # 1.0 driver
46 46
 function _install_pyngus {
47
-    # TODO(kgiusti) remove this once pyngus is upgraded to support
48
-    # auto-loading the proton bits:
49
-    if is_fedora; then
50
-        install_package qpid-proton-c-devel
51
-        install_package python-qpid-proton
52
-    else
53
-        exit_distro_not_supported "QPID AMQP 1.0 Proton libraries"
54
-    fi
55
-
56 47
     # Install pyngus client API
57
-    # TODO(kgiusti) enforce minimal version of pyngus
58 48
     pip_install_gr pyngus
59 49
 }
60 50
 
61 51
 
62 52
 # remove packages used by oslo.messaging AMQP 1.0 driver
63 53
 function _remove_pyngus {
64
-    # TODO(kgiusti) remove this once pyngus is upgraded to support
65
-    # auto-loading the proton bits:
66
-    if is_fedora; then
67
-        uninstall_package qpid-proton-c-devel
68
-        uninstall_package python-qpid-proton
69
-    fi
70
-    # TODO(kgiusti) ubuntu cleanup
71 54
     # TODO(kgiusti) no way to pip uninstall?
72 55
     # pip_install_gr pyngus
73 56
 }
@@ -173,6 +156,9 @@ function _start_qpid_backend {
173 156
 function _cleanup_qpid_backend {
174 157
     if is_fedora; then
175 158
         uninstall_package qpid-cpp-server
159
+	# TODO(kgiusti) can we pull these, or will that break other
160
+	# packages that depend on them?
161
+	
176 162
         # install_package cyrus_sasl_lib
177 163
         # install_package cyrus_sasl_plain
178 164
     elif is_ubuntu; then

Loading…
Cancel
Save