archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modules/terraform: fix -no-color position in workspace command (#43644)

Browse Source
pull/43783/head
Rémi REY 6 years ago committed by Ryan Brown
parent d8bdf38b50
commit 48280463f2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
lib/ansible/modules/cloud/misc/terraform.py
Unescape Escape 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', '-no-color', 'list'] command = [bin_path, 'workspace', 'list', '-no-color']
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', '-no-color', action, workspace] command = [bin_path, 'workspace', action, workspace, '-no-color']
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))

Write Preview
Loading…
Cancel
Save