From 5b6f4258ea05d50e9e10a20cb75dbf82b9b26f8d Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Wed, 5 Nov 2025 15:10:34 +0100 Subject: [PATCH] Update variables --- .gitignore | 1 + 00-provider.tf | 6 +++++- 07-object-storage.tf | 2 +- 80-keypair.tf | 2 +- 99-variables.tf | 10 ++++++++++ project/00-provider.tf | 2 +- project/01-sna.tf | 2 +- project/02-project.tf | 8 ++++---- project/99-variables.tf | 5 +++++ 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9b68eaa..7eedae6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ terraform.tfstate.backup .terraform* .terraform/ *.qcow2 +*.tfvars diff --git a/00-provider.tf b/00-provider.tf index 20c31ea..6f07355 100644 --- a/00-provider.tf +++ b/00-provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { stackit = { source = "stackitcloud/stackit" - version = ">=0.50.0" + version = ">=0.69.0" } } } @@ -20,4 +20,8 @@ provider "stackit" { module "project" { source = "./project" + default_region = var.default_region + service_account_key_path = var.service_account_key_path + name_prefix = var.name_prefix + organization_id = var.organization_id } diff --git a/07-object-storage.tf b/07-object-storage.tf index 0e1c837..7a42843 100644 --- a/07-object-storage.tf +++ b/07-object-storage.tf @@ -1,6 +1,6 @@ resource "stackit_objectstorage_bucket" "example" { project_id = module.project.project_info["project3"].project_id - name = "project-core-testbucket444" + name = "${var.name_prefix}-project-core-testbucket-06-11-25" } resource "stackit_objectstorage_credentials_group" "example" { diff --git a/80-keypair.tf b/80-keypair.tf index a9ddfbb..f5cd9cf 100644 --- a/80-keypair.tf +++ b/80-keypair.tf @@ -1,6 +1,6 @@ // keypair adding to the server resource "stackit_key_pair" "keypair" { name = "pubkeyforauth" - public_key = chomp(file("/root/.ssh/id_ed25519.pub")) + public_key = chomp(file("${var.public_key_file}")) } diff --git a/99-variables.tf b/99-variables.tf index 5b3415b..fc576bc 100644 --- a/99-variables.tf +++ b/99-variables.tf @@ -1,4 +1,10 @@ # -- variables + +variable "name_prefix" { + type = string + default = "test-landing-zone" +} + variable "organization_id" { default = "" } @@ -33,3 +39,7 @@ variable "flavor" { default = "m1.2" } +variable "public_key_file" { + type = string +} + diff --git a/project/00-provider.tf b/project/00-provider.tf index c4d763b..6711d9a 100644 --- a/project/00-provider.tf +++ b/project/00-provider.tf @@ -3,7 +3,7 @@ terraform { required_providers { stackit = { source = "stackitcloud/stackit" - version = ">=0.50.0" + version = ">=0.69.0" } } } diff --git a/project/01-sna.tf b/project/01-sna.tf index 676c575..9d0749c 100644 --- a/project/01-sna.tf +++ b/project/01-sna.tf @@ -5,7 +5,7 @@ resource "stackit_network_area" "sna" { organization_id = var.organization_id - name = "project_sna" + name = "${var.name_prefix}_project_sna" network_ranges = [ { prefix = "10.220.0.0/16" diff --git a/project/02-project.tf b/project/02-project.tf index 6204925..5b47c89 100644 --- a/project/02-project.tf +++ b/project/02-project.tf @@ -7,19 +7,19 @@ variable "projects" { })) default = { project1 = { - name = "landingzone" + name = "grossda_landingzone" owner_email = "michael.sodan@stackit.cloud" } project2 = { - name = "core" + name = "grossda_core" owner_email = "michael.sodan@stackit.cloud" } project3 = { - name = "backup" + name = "grossda_backup" owner_email = "michael.sodan@stackit.cloud" } project4 = { - name = "ske" + name = "grossda_ske" owner_email = "markus.brunsch@stackit.cloud" } } diff --git a/project/99-variables.tf b/project/99-variables.tf index 73291b0..79ac255 100644 --- a/project/99-variables.tf +++ b/project/99-variables.tf @@ -1,4 +1,9 @@ # -- variables +variable "name_prefix" { + type = string + default = "test-landing-zone" +} + variable "organization_id" { default = "" }