From 71c1c09a33bbcfa26aab74472a919aace6a7cd14 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Thu, 3 May 2018 08:34:44 -0700 Subject: [PATCH] Fix pass docker repo command back to the cluster config --- .gitignore | 8 +++++++- .vscode/settings.json | 3 ++- aztk_cli/spark/endpoints/cluster/cluster_create.py | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f27897a..94ec6053 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,14 @@ my-custom-scripts/ .aztk -# Virtual environments +# Environments +.env +.venv +env/ +venv/ ENV/ +env.bak/ +venv.bak/ # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 1ff1c625..88e1a296 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,5 +15,6 @@ "python.formatting.yapfArgs": [ "--style=.style.yapf" ], - "python.pythonPath": "${workspaceFolder}\\ENV\\Scripts\\python.exe" + "python.venvPath": "${workspaceFolder}/.venv/", + "python.pythonPath": "${workspaceFolder}/.venv/Scripts/python.exe" } diff --git a/aztk_cli/spark/endpoints/cluster/cluster_create.py b/aztk_cli/spark/endpoints/cluster/cluster_create.py index 348727be..74e200f4 100644 --- a/aztk_cli/spark/endpoints/cluster/cluster_create.py +++ b/aztk_cli/spark/endpoints/cluster/cluster_create.py @@ -50,6 +50,10 @@ def execute(args: typing.NamedTuple): username=args.username, password=args.password, ))) + + if args.docker_repo and cluster_conf.toolkit: + cluster_conf.toolkit.docker_repo = args.docker_repo + wait = wait if args.wait is None else args.wait user_configuration = cluster_conf.user_configuration