From 59ebe214b9c27740db84df37a802e4e376b7594c Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 17 May 2023 14:32:19 -0400 Subject: [PATCH] teuthology/task/install: reorganize binary helpers We intend to install these so move them into an appropriately named directory. Signed-off-by: Patrick Donnelly --- setup.cfg | 4 ++-- teuthology/task/install/{ => bin}/adjust-ulimits | 0 teuthology/task/install/{ => bin}/daemon-helper | 0 teuthology/task/install/util.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename teuthology/task/install/{ => bin}/adjust-ulimits (100%) rename teuthology/task/install/{ => bin}/daemon-helper (100%) diff --git a/setup.cfg b/setup.cfg index 9fbd84c2c1..4b5b2314c8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -123,8 +123,8 @@ teuthology.openstack = teuthology.suite = fragment-merge.lua teuthology.task.install = - adjust-ulimits - daemon-helper + bin/adjust-ulimits + bin/daemon-helper teuthology.task.internal = edit_sudoers.sh diff --git a/teuthology/task/install/adjust-ulimits b/teuthology/task/install/bin/adjust-ulimits similarity index 100% rename from teuthology/task/install/adjust-ulimits rename to teuthology/task/install/bin/adjust-ulimits diff --git a/teuthology/task/install/daemon-helper b/teuthology/task/install/bin/daemon-helper similarity index 100% rename from teuthology/task/install/daemon-helper rename to teuthology/task/install/bin/daemon-helper diff --git a/teuthology/task/install/util.py b/teuthology/task/install/util.py index 0fec21a613..6e58c9a578 100644 --- a/teuthology/task/install/util.py +++ b/teuthology/task/install/util.py @@ -85,7 +85,7 @@ def _ship_utilities(ctx): destdir = '/usr/bin' for filename in FILES: log.info('Shipping %r...', filename) - src = os.path.join(os.path.dirname(__file__), filename) + src = os.path.join(os.path.dirname(__file__), 'bin', filename) dst = os.path.join(destdir, filename) filenames.append(dst) with open(src, 'rb') as f: -- 2.39.5