starlingx
/
distcloud
Code Issues Proposed changes

Import subprocess from eventlet.green package 

The python kubernetes client requires a newer version of eventlet.
However, newer versions of eventlet have an issue with the subprocess
module, which requires subprocess to be imported from eventlet.green
instead of being imported directly. See:
https://github.com/eventlet/eventlet/issues/413

To allow eventlet to be upversioned (from 0.18.4 to 0.24.1), the
subprocess imports are being changed.

Change-Id: I07a6772282a2ad6a65d86c18df1f4a240d19c509
Story: 2006781
Task: 37583
Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
This commit is contained in:
Bart Wensley 2019-12-19 13:00:52 -06:00
parent c796311b95
commit ab11f85898
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distributedcloud/dcmanager/manager/subcloud_manager.py
View File

@ -21,12 +21,12 @@
# #
import datetime import datetime
from eventlet.green import subprocess
import filecmp import filecmp
import json import json
import keyring import keyring
import netaddr import netaddr
import os import os
import subprocess
import threading import threading
from oslo_log import log as logging from oslo_log import log as logging

2
distributedcloud/dcorch/engine/fernet_key_manager.py
View File

@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from eventlet.green import subprocess
import os import os
import subprocess
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging