From d1f9a9689ab9d879475cdf73dbb787282446c377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 22 Dec 2020 21:53:58 +0100
Subject: [PATCH] Simplify usage of the orchestrator - config.json is the
default config file
---
launch.sh | 2 +-
orchestrate.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/launch.sh b/launch.sh
index 417f9bb..71b6b81 100755
--- a/launch.sh
+++ b/launch.sh
@@ -1,4 +1,4 @@
#! /bin/sh -xe
./terraform apply -auto-approve "$@"
./terraform output -json > config.json
-./orchestrate.py -c config.json
+./orchestrate.py
diff --git a/orchestrate.py b/orchestrate.py
index c1e41ef..7a75d74 100755
--- a/orchestrate.py
+++ b/orchestrate.py
@@ -12,7 +12,8 @@ DEFAULT_ACTIONS = ['files', 'ping', 'init', 'wait', 'deployment']
parser = argparse.ArgumentParser(description='terraform cluster orchestrator')
parser.add_argument('-c', '--config',
- help='Terraform output for using by orchestrator (default: -)', default='-')
+ help='Terraform output for using by orchestrator (default: config.json)',
+ default='config.json')
parser.add_argument('actions', metavar='ACTIONS', nargs='*',
help='actions (default: %s)' % ' '.join(DEFAULT_ACTIONS),
default=DEFAULT_ACTIONS)
--
GitLab