From 289922bea75575a1b59e2025e5fca817b4333caf Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Tue, 31 Oct 2023 09:44:34 +0000 Subject: [PATCH] restructured project to have /src folder --- autoignition.py => src/autoignition.py | 0 cli.py => src/cli.py | 0 config.py => src/config.py | 3 ++- create_disk.py => src/create_disk.py | 0 create_img.py => src/create_img.py | 0 debug.py => src/debug.py | 0 {docker => src/docker}/fuel-ignition.dockerfile | 0 {docker => src/docker}/validate.dockerfile | 0 node_deployer.py => src/node_deployer.py | 0 {scripts => src/scripts}/fetch_config.sh | 0 {scripts => src/scripts}/installs.sh | 0 {scripts => src/scripts}/validate.sh | 0 {templates => src/templates}/fuelignition.json | 0 {templates => src/templates}/join_swarm.service | 0 {templates => src/templates}/join_swarm.sh | 0 utils.py => src/utils.py | 0 16 files changed, 2 insertions(+), 1 deletion(-) rename autoignition.py => src/autoignition.py (100%) rename cli.py => src/cli.py (100%) rename config.py => src/config.py (95%) rename create_disk.py => src/create_disk.py (100%) rename create_img.py => src/create_img.py (100%) rename debug.py => src/debug.py (100%) rename {docker => src/docker}/fuel-ignition.dockerfile (100%) rename {docker => src/docker}/validate.dockerfile (100%) rename node_deployer.py => src/node_deployer.py (100%) rename {scripts => src/scripts}/fetch_config.sh (100%) rename {scripts => src/scripts}/installs.sh (100%) rename {scripts => src/scripts}/validate.sh (100%) rename {templates => src/templates}/fuelignition.json (100%) rename {templates => src/templates}/join_swarm.service (100%) rename {templates => src/templates}/join_swarm.sh (100%) rename utils.py => src/utils.py (100%) diff --git a/autoignition.py b/src/autoignition.py similarity index 100% rename from autoignition.py rename to src/autoignition.py diff --git a/cli.py b/src/cli.py similarity index 100% rename from cli.py rename to src/cli.py diff --git a/config.py b/src/config.py similarity index 95% rename from config.py rename to src/config.py index a2f2ea2..81b34d3 100644 --- a/config.py +++ b/src/config.py @@ -11,6 +11,7 @@ import docker CLIENT = docker.from_env(version="auto") +ROOT = Path(__file__).parent.parent type ConfigLabel = str | list[str] @@ -18,7 +19,7 @@ type ConfigLabel = str | list[str] def get_config(config_label: ConfigLabel = ["default"]) -> dict: if isinstance(config_label, str): config_label = [config_label] - with open("config.toml", "rb") as f: + with open(ROOT / "config.toml", "rb") as f: configs: dict = tomllib.load(f) out_config: dict = {} for c in config_label: diff --git a/create_disk.py b/src/create_disk.py similarity index 100% rename from create_disk.py rename to src/create_disk.py diff --git a/create_img.py b/src/create_img.py similarity index 100% rename from create_img.py rename to src/create_img.py diff --git a/debug.py b/src/debug.py similarity index 100% rename from debug.py rename to src/debug.py diff --git a/docker/fuel-ignition.dockerfile b/src/docker/fuel-ignition.dockerfile similarity index 100% rename from docker/fuel-ignition.dockerfile rename to src/docker/fuel-ignition.dockerfile diff --git a/docker/validate.dockerfile b/src/docker/validate.dockerfile similarity index 100% rename from docker/validate.dockerfile rename to src/docker/validate.dockerfile diff --git a/node_deployer.py b/src/node_deployer.py similarity index 100% rename from node_deployer.py rename to src/node_deployer.py diff --git a/scripts/fetch_config.sh b/src/scripts/fetch_config.sh similarity index 100% rename from scripts/fetch_config.sh rename to src/scripts/fetch_config.sh diff --git a/scripts/installs.sh b/src/scripts/installs.sh similarity index 100% rename from scripts/installs.sh rename to src/scripts/installs.sh diff --git a/scripts/validate.sh b/src/scripts/validate.sh similarity index 100% rename from scripts/validate.sh rename to src/scripts/validate.sh diff --git a/templates/fuelignition.json b/src/templates/fuelignition.json similarity index 100% rename from templates/fuelignition.json rename to src/templates/fuelignition.json diff --git a/templates/join_swarm.service b/src/templates/join_swarm.service similarity index 100% rename from templates/join_swarm.service rename to src/templates/join_swarm.service diff --git a/templates/join_swarm.sh b/src/templates/join_swarm.sh similarity index 100% rename from templates/join_swarm.sh rename to src/templates/join_swarm.sh diff --git a/utils.py b/src/utils.py similarity index 100% rename from utils.py rename to src/utils.py