its less functional :-(

This commit is contained in:
jem 2020-03-03 17:33:00 +01:00
parent 69759234e8
commit f65fbe206b
4 changed files with 23 additions and 19 deletions

View file

@ -4,8 +4,9 @@ from .devops_terraform_build import DevopsTerraformBuild
def add_aws_mixin_config(config, account_name): def add_aws_mixin_config(config, account_name):
return config.update({'AwsMixin': config.update({'AwsMixin':
{'account_name': account_name}}) {'account_name': account_name}})
return config
class AwsMixin(DevopsTerraformBuild): class AwsMixin(DevopsTerraformBuild):

View file

@ -4,18 +4,19 @@ from .devops_build import DevopsBuild
def add_dda_pallet_mixin_config(config, tenant, application, domain_file_name): def add_dda_pallet_mixin_config(config, tenant, application, domain_file_name):
return config.update({'DdaPalletMixin': config.update({'DdaPalletMixin':
{'tenant': tenant, {'tenant': tenant,
'application': application, 'application': application,
'domain_file_name': domain_file_name, 'domain_file_name': domain_file_name,
'target_edn_name': 'target.edn', 'target_edn_name': 'target.edn',
'jar_file': 'target/meissa-tenant-server.jar', 'jar_file': 'target/meissa-tenant-server.jar',
'target_template': 'target_template':
""" """
{:existing [{:node-name "$node_name" {:existing [{:node-name "$node_name"
:node-ip "$ipv4"}] :node-ip "$ipv4"}]
:provisioning-user {:login "root"}} :provisioning-user {:login "root"}}
""", }}) """, }})
return config
class DdaPalletMixin(DevopsBuild): class DdaPalletMixin(DevopsBuild):

View file

@ -9,12 +9,13 @@ def create_devops_terraform_build_config(stage, project_root_path, build_commons
account_name, additional_vars, tf_import_name, tf_import_resource): account_name, additional_vars, tf_import_name, tf_import_resource):
ret = create_devops_build_config( ret = create_devops_build_config(
stage, project_root_path, build_commons_path, module) stage, project_root_path, build_commons_path, module)
return ret.update({'account_name': account_name, ret.update({'account_name': account_name,
'additional_vars': additional_vars, 'additional_vars': additional_vars,
'tf_import_name': tf_import_name, 'tf_import_name': tf_import_name,
'tf_import_resource': tf_import_resource, 'tf_import_resource': tf_import_resource,
'terraform_build_commons_dir_name': 'terraform', 'terraform_build_commons_dir_name': 'terraform',
'output_json_name': 'output.json'}) 'output_json_name': 'output.json'})
return ret
class DevopsTerraformBuild(DevopsBuild): class DevopsTerraformBuild(DevopsBuild):

View file

@ -3,8 +3,9 @@ from .devops_terraform_build import DevopsTerraformBuild
def add_hetzner_mixin_config(config): def add_hetzner_mixin_config(config):
return config.update({'HetznerMixin': config.update({'HetznerMixin':
{'HETZNER_API_KEY_PATH_ENVIRONMENT': 'HETZNER_API_KEY_PATH'}}) {'HETZNER_API_KEY_PATH_ENVIRONMENT': 'HETZNER_API_KEY_PATH'}})
return config
class HetznerMixin(DevopsTerraformBuild): class HetznerMixin(DevopsTerraformBuild):