initial try

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

View file

@ -28,7 +28,7 @@ use_plugin("python.distutils")
default_task = "publish"
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"
description = __doc__
authors = [Author("meissa GmbH", "buero@meissa-gmbh.de")]

View file

@ -44,13 +44,13 @@ def create_devops_terraform_build_config(stage,
class DevopsTerraformBuild(DevopsBuild):
def __init__(self, project, config):
inp = {}
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"]=[]
inp["mixin_types"]=[]
inp["build_types"]=config.get("build_types", [])
inp["mixin_types"]=config.get("mixin_types", [])
super().__init__(project, inp)
project.build_depends_on('dda-python-terraform')
self.additional_vars = config['additional_vars']

View file

@ -58,7 +58,14 @@ def add_provs_k3s_mixin_config(config,
class ProvsK3sMixin(DevopsBuild):
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']
self.fqdn = provs_k3s_mixin_config['fqdn']
self.put('fqdn', self.fqdn)