xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-04-04 17:48:35 +00:00
Code Issues Projects Releases Wiki Activity

Make the websocket module optional

Browse Source 
Have tsmsol gracefully degrade for Wheezy, where
it is not relevant to that platform.
This commit is contained in:
Jarrod Johnson 2019-11-20 13:53:16 -05:00
parent ab0168b2ec
commit 06c53e9d89
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confluent_server/builddeb
View File

@ -32,7 +32,7 @@ if [ "$OPKGNAME" = "confluent-server" ]; then
if grep wheezy /etc/os-release; then
sed -i 's/^\(Depends:.*\)/\1, python-confluent-client, python-lxml, python-eficompressor, python-pycryptodomex, python-dateutil, python-pyopenssl/' debian/control
else
sed -i 's/^\(Depends:.*\)/\1, confluent-client, python-lxml, python-eficompressor, python-pycryptodome, python-dateutil/' debian/control
sed -i 's/^\(Depends:.*\)/\1, confluent-client, python-lxml, python-eficompressor, python-pycryptodome, python-dateutil, python-websocket/' debian/control
fi
if grep wheezy /etc/os-release; then
echo 'confluent_client python-confluent-client' >> debian/pydist-overrides

8
confluent_server/confluent/plugins/console/tsmsol.py
View File

@ -27,7 +27,11 @@ import pyghmi.exceptions as pygexc
import pyghmi.redfish.command as rcmd
import eventlet
import eventlet.green.ssl as ssl
websocket = eventlet.import_patched('websocket')
try:
websocket = eventlet.import_patched('websocket')
wso = websocket.WebSocket
except Exception:
wso = object
def get_conn_params(node, configdata):
if 'secret.hardwaremanagementuser' in configdata:
@ -51,7 +55,7 @@ _configattributes = ('secret.hardwaremanagementuser',
'secret.hardwaremanagementpassword',
'hardwaremanagement.manager')
class WrappedWebSocket(websocket.WebSocket):
class WrappedWebSocket(wso):
def set_verify_callback(self, callback):
self._certverify = callback