diff --git a/README.md b/README.md index df9bc966..4c6adaf8 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ the list of container image names, while `clister-list.txt` specifies the set of Files required to build each container image are stored under `./container-build/` Files required at deploy-time are stored under `./config/` ``` -├── cluster-list.txt +├── pod-list.txt ├── compose │   ├── docker-compose-contract.yml │   ├── docker-compose-db-sharding.yml diff --git a/app/deploy_system.py b/app/deploy_system.py index 48aef089..f79595ff 100644 --- a/app/deploy_system.py +++ b/app/deploy_system.py @@ -24,9 +24,10 @@ from .util import include_exclude_check @click.command() @click.option("--include", help="only start these components") @click.option("--exclude", help="don\'t start these components") +@click.option("--cluster", help="specify a non-default cluster name") @click.argument('command') # help: command: up|down|ps @click.pass_context -def command(ctx, include, exclude, command): +def command(ctx, include, exclude, cluster, command): '''deploy a stack''' # TODO: implement option exclusion and command value constraint lost with the move from argparse to click @@ -35,16 +36,16 @@ def command(ctx, include, exclude, command): verbose = ctx.obj.verbose dry_run = ctx.obj.dry_run - with open("cluster-list.txt") as cluster_list_file: - clusters = cluster_list_file.read().splitlines() + with open("pod-list.txt") as pod_list_file: + pods = pod_list_file.read().splitlines() if verbose: - print(f'Cluster components: {clusters}') + print(f'Cluster components: {pods}') # Construct a docker compose command suitable for our purpose compose_files = [] - for cluster in clusters: + for pod in pods: if include_exclude_check(cluster, include, exclude): compose_file_name = os.path.join("compose", f"docker-compose-{cluster}.yml") compose_files.append(compose_file_name) diff --git a/cluster-list.txt b/pod-list.txt similarity index 100% rename from cluster-list.txt rename to pod-list.txt