fix devops_terraform_build
This commit is contained in:
parent
391f735f7d
commit
253c514919
2 changed files with 4 additions and 2 deletions
2
build.py
2
build.py
|
@ -28,7 +28,7 @@ use_plugin("python.distutils")
|
||||||
default_task = "publish"
|
default_task = "publish"
|
||||||
|
|
||||||
name = "ddadevops"
|
name = "ddadevops"
|
||||||
version = "2.0.0"
|
version = "2.0.1-dev"
|
||||||
summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud"
|
summary = "tools to support builds combining gopass, terraform, dda-pallet, aws & hetzner-cloud"
|
||||||
description = __doc__
|
description = __doc__
|
||||||
authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]
|
authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]
|
||||||
|
|
|
@ -13,7 +13,7 @@ def create_devops_terraform_build_config(stage,
|
||||||
module,
|
module,
|
||||||
additional_vars,
|
additional_vars,
|
||||||
build_dir_name='target',
|
build_dir_name='target',
|
||||||
output_json_name='out_' + module + '.json',
|
output_json_name=None,
|
||||||
use_workspace=True,
|
use_workspace=True,
|
||||||
use_package_common_files=True,
|
use_package_common_files=True,
|
||||||
build_commons_path=None,
|
build_commons_path=None,
|
||||||
|
@ -21,6 +21,8 @@ def create_devops_terraform_build_config(stage,
|
||||||
debug_print_terraform_command=False,
|
debug_print_terraform_command=False,
|
||||||
additional_tfvar_files=[],
|
additional_tfvar_files=[],
|
||||||
terraform_version=0.15):
|
terraform_version=0.15):
|
||||||
|
if not output_json_name:
|
||||||
|
output_json_name = 'out_' + module + '.json'
|
||||||
ret = create_devops_build_config(
|
ret = create_devops_build_config(
|
||||||
stage, project_root_path, module, build_dir_name)
|
stage, project_root_path, module, build_dir_name)
|
||||||
ret.update({'additional_vars': additional_vars,
|
ret.update({'additional_vars': additional_vars,
|
||||||
|
|
Loading…
Reference in a new issue