From 1232d9d2dd43e180f113f42b07531705d7f30a7c Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 1 Nov 2016 16:52:08 -0600 Subject: [PATCH] Make the install task a subpackage Signed-off-by: Zack Cerza --- teuthology/task/{install.py => install/__init__.py} | 4 ++-- teuthology/task/{ => install}/adjust-ulimits | 0 teuthology/task/{ => install}/daemon-helper | 0 teuthology/task/{ => install}/packages.yaml | 0 teuthology/task/{ => install}/valgrind.supp | 0 teuthology/test/task/test_install.py | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename teuthology/task/{install.py => install/__init__.py} (99%) rename teuthology/task/{ => install}/adjust-ulimits (100%) rename teuthology/task/{ => install}/daemon-helper (100%) rename teuthology/task/{ => install}/packages.yaml (100%) rename teuthology/task/{ => install}/valgrind.supp (100%) diff --git a/teuthology/task/install.py b/teuthology/task/install/__init__.py similarity index 99% rename from teuthology/task/install.py rename to teuthology/task/install/__init__.py index 00ca2e786c..9d2d782c30 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install/__init__.py @@ -12,8 +12,8 @@ from teuthology.config import config as teuth_config from teuthology import misc as teuthology from teuthology import contextutil, packaging from teuthology.parallel import parallel -from ..orchestra import run -from . import ansible +from teuthology.orchestra import run +from teuthology.task import ansible log = logging.getLogger(__name__) diff --git a/teuthology/task/adjust-ulimits b/teuthology/task/install/adjust-ulimits similarity index 100% rename from teuthology/task/adjust-ulimits rename to teuthology/task/install/adjust-ulimits diff --git a/teuthology/task/daemon-helper b/teuthology/task/install/daemon-helper similarity index 100% rename from teuthology/task/daemon-helper rename to teuthology/task/install/daemon-helper diff --git a/teuthology/task/packages.yaml b/teuthology/task/install/packages.yaml similarity index 100% rename from teuthology/task/packages.yaml rename to teuthology/task/install/packages.yaml diff --git a/teuthology/task/valgrind.supp b/teuthology/task/install/valgrind.supp similarity index 100% rename from teuthology/task/valgrind.supp rename to teuthology/task/install/valgrind.supp diff --git a/teuthology/test/task/test_install.py b/teuthology/test/task/test_install.py index be08868d6d..34345eaf8b 100644 --- a/teuthology/test/task/test_install.py +++ b/teuthology/test/task/test_install.py @@ -12,7 +12,7 @@ class TestInstall(object): def _get_default_package_list(self, project='ceph', debug=False): path = os.path.join( os.path.dirname(__file__), - '..', '..', 'task', 'packages.yaml', + '..', '..', 'task', 'install', 'packages.yaml', ) pkgs = yaml.safe_load(open(path))[project] if not debug: -- 2.39.5