meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

initial try

Browse source
This commit is contained in:
Michael Jerger 2023-05-22 10:46:11 +02:00
parent f8c6af8fd1
commit 61dfa82661
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.py
View file

@ -28,7 +28,7 @@ use_plugin("python.distutils")
default_task = "publish" default_task = "publish"
name = "ddadevops" name = "ddadevops"
version = "4.0.0-dev45" version = "4.0.0-dev47"
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")]

6
src/main/python/ddadevops/devops_terraform_build.py
View file

@ -44,13 +44,13 @@ def create_devops_terraform_build_config(stage,
class DevopsTerraformBuild(DevopsBuild): class DevopsTerraformBuild(DevopsBuild):
def __init__(self, project, config): def __init__(self, project, config):
inp = {} inp = config.copy()
inp["name"]=project.name inp["name"]=project.name
inp["module"]=config.get("module") inp["module"]=config.get("module")
inp["stage"]=config.get("stage") inp["stage"]=config.get("stage")
inp["project_root_path"]=config.get("project_root_path") inp["project_root_path"]=config.get("project_root_path")
inp["build_types"]=[] inp["build_types"]=config.get("build_types", [])
inp["mixin_types"]=[] inp["mixin_types"]=config.get("mixin_types", [])
super().__init__(project, inp) super().__init__(project, inp)
project.build_depends_on('dda-python-terraform') project.build_depends_on('dda-python-terraform')
self.additional_vars = config['additional_vars'] self.additional_vars = config['additional_vars']

9
src/main/python/ddadevops/provs_k3s_mixin.py
View file

@ -58,7 +58,14 @@ def add_provs_k3s_mixin_config(config,
class ProvsK3sMixin(DevopsBuild): class ProvsK3sMixin(DevopsBuild):
def __init__(self, project, config): def __init__(self, project, config):
super().__init__(project, config) inp = config.copy()
inp["name"]=project.name
inp["module"]=config.get("module")
inp["stage"]=config.get("stage")
inp["project_root_path"]=config.get("project_root_path")
inp["build_types"]=config.get("build_types", [])
inp["mixin_types"]=config.get("mixin_types", [])
super().__init__(project, inp)
provs_k3s_mixin_config = config['ProvsK3sMixin'] provs_k3s_mixin_config = config['ProvsK3sMixin']
self.fqdn = provs_k3s_mixin_config['fqdn'] self.fqdn = provs_k3s_mixin_config['fqdn']
self.put('fqdn', self.fqdn) self.put('fqdn', self.fqdn)