From 08dd85c601af6e83a1fe851c097c4f75e8c9ccf4 Mon Sep 17 00:00:00 2001 From: Kyr Shatskyy Date: Thu, 18 Jun 2020 12:44:14 +0200 Subject: [PATCH] qa/tasks/salt: fix module path for py3 Signed-off-by: Kyr Shatskyy --- qa/tasks/ceph_salt.py | 15 ++++++++------- qa/tasks/salt.py | 4 ++-- qa/tasks/salt_manager.py | 2 +- qa/tasks/scripts.py | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/qa/tasks/ceph_salt.py b/qa/tasks/ceph_salt.py index 9f5ac85a69fec..0607ab327b542 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 949c95358ce9f..1e12ceff43fd9 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 653d44b93e3fe..9da0f85a77c4b 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 7ebc032e8f0cb..f144c6fb707f8 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: -- 2.39.5