Commit 8916d530 by Bach Dániel

vm: fix random unicode errors

Closes #377
parent bd2667df
...@@ -26,7 +26,6 @@ from StringIO import StringIO ...@@ -26,7 +26,6 @@ from StringIO import StringIO
from tarfile import TarFile, TarInfo from tarfile import TarFile, TarInfo
import time import time
from urlparse import urlsplit from urlparse import urlsplit
from salt.client import LocalClient
from django.core.exceptions import PermissionDenied, SuspiciousOperation from django.core.exceptions import PermissionDenied, SuspiciousOperation
from django.utils import timezone from django.utils import timezone
...@@ -1203,6 +1202,8 @@ class UpdateNodeOperation(NodeOperation): ...@@ -1203,6 +1202,8 @@ class UpdateNodeOperation(NodeOperation):
async_queue = "localhost.man.slow" async_queue = "localhost.man.slow"
def minion_cmd(self, module, params, timeout=3600): def minion_cmd(self, module, params, timeout=3600):
# see https://git.ik.bme.hu/circle/cloud/issues/377
from salt.client import LocalClient
name = self.node.host.hostname name = self.node.host.hostname
client = LocalClient() client = LocalClient()
data = client.cmd( data = client.cmd(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment