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 9f5ac85a69fecc9ef8acd2c1d16c898b633f6932..0607ab327b54210ed08cd3c22225732f29117664 100644 (file)
--- 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 949c95358ce9fc90978a58db7ae2d8e71812fed8..1e12ceff43fd9035626a0d5538c0b1c28d5cd972 100644 (file)
--- 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 653d44b93e3febac7884a2c0a93ac818cabd1144..9da0f85a77c4bf83faf39c7e41af506137f3321b 100644 (file)
--- 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 7ebc032e8f0cb524efe18b12f1dfde187154b299..f144c6fb707f8dc3d57726d0449fddfaefd5db80 100644 (file)
--- 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: