From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Thu, 18 Jun 2020 10:44:14 +0000 (+0200)
Subject: qa/tasks/salt: fix module path for py3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08dd85c601af6e83a1fe851c097c4f75e8c9ccf4;p=ceph.git

qa/tasks/salt: fix module path for py3

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

diff --git a/qa/tasks/ceph_salt.py b/qa/tasks/ceph_salt.py
index 9f5ac85a69f..0607ab327b5 100644
--- a/qa/tasks/ceph_salt.py
+++ b/qa/tasks/ceph_salt.py
@@ -8,18 +8,19 @@ import logging
 import argparse
 import uuid
 
-from salt_manager import SaltManager
-from scripts import Scripts
 from teuthology import misc
-from util import (
+from teuthology.exceptions import ConfigError
+from teuthology.orchestra.daemon import DaemonGroup
+from teuthology.task import Task
+
+from tasks.ceph import get_mons
+from tasks.salt_manager import SaltManager
+from tasks.scripts import Scripts
+from tasks.util import (
     introspect_roles,
     remote_exec,
     )
 
-from teuthology.exceptions import ConfigError
-from teuthology.task import Task
-from teuthology.orchestra.daemon import DaemonGroup
-from tasks.ceph import get_mons
 
 log = logging.getLogger(__name__)
 ceph_salt_ctx = {}
diff --git a/qa/tasks/salt.py b/qa/tasks/salt.py
index 949c95358ce..1e12ceff43f 100644
--- a/qa/tasks/salt.py
+++ b/qa/tasks/salt.py
@@ -6,8 +6,8 @@ Linter:
 '''
 import logging
 
-from salt_manager import SaltManager
-from util import remote_exec
+from tasks.salt_manager import SaltManager
+from tasks.util import remote_exec
 from teuthology.exceptions import ConfigError
 from teuthology.misc import (
     delete_file,
diff --git a/qa/tasks/salt_manager.py b/qa/tasks/salt_manager.py
index 653d44b93e3..9da0f85a77c 100644
--- a/qa/tasks/salt_manager.py
+++ b/qa/tasks/salt_manager.py
@@ -22,7 +22,7 @@ import re
 from teuthology.contextutil import safe_while
 from teuthology.exceptions import CommandFailedError, MaxWhileTries
 from teuthology.orchestra import run
-from util import get_remote_for_role
+from tasks.util import get_remote_for_role
 
 log = logging.getLogger(__name__)
 master_role = 'client.salt_master'
diff --git a/qa/tasks/scripts.py b/qa/tasks/scripts.py
index 7ebc032e8f0..f144c6fb707 100644
--- a/qa/tasks/scripts.py
+++ b/qa/tasks/scripts.py
@@ -1,6 +1,6 @@
 import os
 
-from util import copy_directory_recursively
+from tasks.util import copy_directory_recursively
 
 
 class Scripts: