From e711d01ed1337b28578a7ccc3d114b2641c871a8 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 21 Dec 2019 18:49:38 +0700 Subject: [PATCH] #58578 support absolute paths additionally (#58812) * support absolute paths additionally * add changelog * rename changelog * fix changelog to bugfix --- .../fragments/58812-support_absolute_paths_additionally.yml | 3 +++ lib/ansible/modules/cloud/misc/terraform.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/58812-support_absolute_paths_additionally.yml diff --git a/changelogs/fragments/58812-support_absolute_paths_additionally.yml b/changelogs/fragments/58812-support_absolute_paths_additionally.yml new file mode 100644 index 00000000000..a26e1b571ed --- /dev/null +++ b/changelogs/fragments/58812-support_absolute_paths_additionally.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - terraform - adding support for absolute paths additionally to the relative path within project_path (https://github.com/ansible/ansible/issues/58578) diff --git a/lib/ansible/modules/cloud/misc/terraform.py b/lib/ansible/modules/cloud/misc/terraform.py index 1d54be2f4bf..3b7ad647d6e 100644 --- a/lib/ansible/modules/cloud/misc/terraform.py +++ b/lib/ansible/modules/cloud/misc/terraform.py @@ -350,7 +350,7 @@ def main(): if state == 'absent': command.extend(variables_args) elif state == 'present' and plan_file: - if os.path.exists(project_path + "/" + plan_file): + if any([os.path.isfile(project_path + "/" + plan_file), os.path.isfile(plan_file)]): command.append(plan_file) else: module.fail_json(msg='Could not find plan_file "{0}", check the path and try again.'.format(plan_file))