cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modules/terraform: use -no-color option in workspace commands (#43628)

Browse source
This commit is contained in:
Rémi REY 2018-08-03 14:24:57 +02:00 committed by Ryan Brown
parent 5130b67159
commit 32c01644d4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/misc/terraform.py
View file

@ -183,7 +183,7 @@ def init_plugins(bin_path, project_path):
def get_workspace_context(bin_path, project_path): def get_workspace_context(bin_path, project_path):
workspace_ctx = {"current": "default", "all": []} workspace_ctx = {"current": "default", "all": []}
command = [bin_path, 'workspace', 'list'] command = [bin_path, 'workspace', '-no-color', 'list']
rc, out, err = module.run_command(command, cwd=project_path) rc, out, err = module.run_command(command, cwd=project_path)
if rc != 0: if rc != 0:
module.fail_json(msg="Failed to list Terraform workspaces:\r\n{0}".format(err)) module.fail_json(msg="Failed to list Terraform workspaces:\r\n{0}".format(err))
@ -199,7 +199,7 @@ def get_workspace_context(bin_path, project_path):
def _workspace_cmd(bin_path, project_path, action, workspace): def _workspace_cmd(bin_path, project_path, action, workspace):
command = [bin_path, 'workspace', action, workspace] command = [bin_path, 'workspace', '-no-color', action, workspace]
rc, out, err = module.run_command(command, cwd=project_path) rc, out, err = module.run_command(command, cwd=project_path)
if rc != 0: if rc != 0:
module.fail_json(msg="Failed to {0} workspace:\r\n{1}".format(action, err)) module.fail_json(msg="Failed to {0} workspace:\r\n{1}".format(action, err))