This commit is contained in:
jem 2021-05-07 18:53:32 +02:00
parent 552b962cd2
commit ffd020292b
4 changed files with 2 additions and 20 deletions

View file

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

View file

@ -24,6 +24,7 @@ class AwsBackendPropertiesMixin(DevopsTerraformBuild):
def copy_build_resources_from_package(self): def copy_build_resources_from_package(self):
super().copy_build_resources_from_package() super().copy_build_resources_from_package()
self.copy_build_resource_file_from_package('provider_registry.tf')
self.copy_build_resource_file_from_package('aws_provider.tf') self.copy_build_resource_file_from_package('aws_provider.tf')
self.copy_build_resource_file_from_package( self.copy_build_resource_file_from_package(
'aws_backend_properties_vars.tf') 'aws_backend_properties_vars.tf')

View file

@ -1,12 +1,3 @@
terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 3.0"
}
}
}
provider "aws" { provider "aws" {
region = var.region region = var.region
} }

View file

@ -1,14 +1,4 @@
# Configure the Hetzner Cloud Provider # Configure the Hetzner Cloud Provider
terraform {
required_providers {
hcloud = {
source = "hetznercloud/hcloud" # this whole block is important
version = "1.23.0"
}
}
required_version = ">= 0.13"
}
provider "hcloud" { provider "hcloud" {
token = var.hetzner_api_key token = var.hetzner_api_key
} }