From e4c810dea73e11d61af76ec68751afde250979d9 Mon Sep 17 00:00:00 2001 From: Mauritz Uphoff Date: Thu, 12 Jun 2025 12:26:59 +0200 Subject: [PATCH] clean up repo --- .gitignore | 3 ++- .terraform.lock.hcl | 19 ------------------- 00-provider.tf | 5 ++--- 01-config.tf | 19 ++++++++++++------- 03-network.tf | 12 ++++++------ 04-master.tf | 8 ++++---- 05-backup.tf | 8 ++++---- 06-ha.tf | 4 ++-- example.env | 4 ---- 9 files changed, 32 insertions(+), 50 deletions(-) delete mode 100644 example.env diff --git a/.gitignore b/.gitignore index 1e72f21..e3644a5 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,5 @@ terraform.rc conf.img .DS_Store -.idea \ No newline at end of file +.idea +keys/* \ No newline at end of file diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index ef02297..1ca35fb 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -1,25 +1,6 @@ # This file is maintained automatically by "terraform init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/random" { - version = "3.7.2" - hashes = [ - "h1:KG4NuIBl1mRWU0KD/BGfCi1YN/j3F7H4YgeeM7iSdNs=", - "zh:14829603a32e4bc4d05062f059e545a91e27ff033756b48afbae6b3c835f508f", - "zh:1527fb07d9fea400d70e9e6eb4a2b918d5060d604749b6f1c361518e7da546dc", - "zh:1e86bcd7ebec85ba336b423ba1db046aeaa3c0e5f921039b3f1a6fc2f978feab", - "zh:24536dec8bde66753f4b4030b8f3ef43c196d69cccbea1c382d01b222478c7a3", - "zh:29f1786486759fad9b0ce4fdfbbfece9343ad47cd50119045075e05afe49d212", - "zh:4d701e978c2dd8604ba1ce962b047607701e65c078cb22e97171513e9e57491f", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7b8434212eef0f8c83f5a90c6d76feaf850f6502b61b53c329e85b3b281cba34", - "zh:ac8a23c212258b7976e1621275e3af7099e7e4a3d4478cf8d5d2a27f3bc3e967", - "zh:b516ca74431f3df4c6cf90ddcdb4042c626e026317a33c53f0b445a3d93b720d", - "zh:dc76e4326aec2490c1600d6871a95e78f9050f9ce427c71707ea412a2f2f1a62", - "zh:eac7b63e86c749c7d48f527671c7aee5b4e26c10be6ad7232d6860167f99dbb0", - ] -} - provider "registry.terraform.io/stackitcloud/stackit" { version = "0.55.0" constraints = "0.55.0" diff --git a/00-provider.tf b/00-provider.tf index f508563..a046d1d 100644 --- a/00-provider.tf +++ b/00-provider.tf @@ -18,8 +18,7 @@ terraform { } } -# Configure the STACKIT Provider provider "stackit" { - default_region = "eu01" - service_account_token = var.STACKIT_SERVICE_ACCOUNT_TOKEN + default_region = var.stackit_region + service_account_key_path = var.stackit_service_account_key_path } diff --git a/01-config.tf b/01-config.tf index 4dde5d9..7f5b5f2 100644 --- a/01-config.tf +++ b/01-config.tf @@ -1,12 +1,17 @@ -# STACKIT Service Account Token -variable "STACKIT_SERVICE_ACCOUNT_TOKEN" { - type = string - description = "" +variable "stackit_project_id" { + type = string + /*default = "XXXXX-XXXX-XXXX-XXXX-XXXXXXX"*/ + default = "d75e6aab-b616-4b42-ae3b-aaf161ad626d" } -variable "STACKIT_PROJECT_ID" { - type = string - description = "" +variable "stackit_region" { + type = string + default = "eu01" +} + +variable "stackit_service_account_key_path" { + type = string + default = "./keys/stackit-sa.json" } variable "debian_image" { diff --git a/03-network.tf b/03-network.tf index 168b8b5..3e4a667 100644 --- a/03-network.tf +++ b/03-network.tf @@ -1,6 +1,6 @@ # Create vNET Network resource "stackit_network" "default" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id ipv4_prefix = "10.1.2.0/24" name = "default" ipv4_nameservers = ["9.9.9.9", "1.1.1.1"] @@ -8,12 +8,12 @@ resource "stackit_network" "default" { # Security Group resource "stackit_security_group" "active-passive" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id name = "ha-active-passive" } resource "stackit_security_group_rule" "icmp" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id security_group_id = stackit_security_group.active-passive.security_group_id direction = "ingress" icmp_parameters = { @@ -26,7 +26,7 @@ resource "stackit_security_group_rule" "icmp" { } resource "stackit_security_group_rule" "ssh" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id security_group_id = stackit_security_group.active-passive.security_group_id direction = "ingress" port_range = { @@ -39,7 +39,7 @@ resource "stackit_security_group_rule" "ssh" { } resource "stackit_security_group_rule" "http" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id security_group_id = stackit_security_group.active-passive.security_group_id direction = "ingress" port_range = { @@ -52,7 +52,7 @@ resource "stackit_security_group_rule" "http" { } resource "stackit_security_group_rule" "vrrp" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id security_group_id = stackit_security_group.active-passive.security_group_id direction = "ingress" protocol = { diff --git a/04-master.tf b/04-master.tf index 7e34a78..f6ec77c 100644 --- a/04-master.tf +++ b/04-master.tf @@ -1,6 +1,6 @@ # Create virtual Server resource "stackit_server" "example01" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id name = "example01" boot_volume = { size = 64 @@ -16,20 +16,20 @@ resource "stackit_server" "example01" { } resource "stackit_network_interface" "example01" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id network_id = stackit_network.default.network_id allowed_addresses = [format("%s/%s", stackit_network_interface.vip01.ipv4, "32")] security_group_ids = [stackit_security_group.active-passive.security_group_id] } resource "stackit_server_network_interface_attach" "example01-nic-attachment" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id server_id = stackit_server.example01.server_id network_interface_id = stackit_network_interface.example01.network_interface_id } resource "stackit_public_ip" "example01-wan" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id network_interface_id = stackit_network_interface.example01.network_interface_id depends_on = [stackit_server_network_interface_attach.example01-nic-attachment] } diff --git a/05-backup.tf b/05-backup.tf index a1445aa..18e1c2b 100644 --- a/05-backup.tf +++ b/05-backup.tf @@ -1,6 +1,6 @@ # Create virtual Server resource "stackit_server" "example02" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id name = "example02" boot_volume = { size = 64 @@ -16,20 +16,20 @@ resource "stackit_server" "example02" { } resource "stackit_network_interface" "example02" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id network_id = stackit_network.default.network_id allowed_addresses = [format("%s/%s", stackit_network_interface.vip01.ipv4, "32")] security_group_ids = [stackit_security_group.active-passive.security_group_id] } resource "stackit_server_network_interface_attach" "example02-nic-attachment" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id server_id = stackit_server.example02.server_id network_interface_id = stackit_network_interface.example02.network_interface_id } resource "stackit_public_ip" "example02-wan" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id network_interface_id = stackit_network_interface.example02.network_interface_id depends_on = [stackit_server_network_interface_attach.example02-nic-attachment] } diff --git a/06-ha.tf b/06-ha.tf index 9c30e2d..181c8b4 100644 --- a/06-ha.tf +++ b/06-ha.tf @@ -1,10 +1,10 @@ resource "stackit_network_interface" "vip01" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id network_id = stackit_network.default.network_id security = false } resource "stackit_public_ip" "vip01-wan" { - project_id = var.STACKIT_PROJECT_ID + project_id = var.stackit_project_id network_interface_id = stackit_network_interface.vip01.network_interface_id } diff --git a/example.env b/example.env deleted file mode 100644 index d707323..0000000 --- a/example.env +++ /dev/null @@ -1,4 +0,0 @@ -# STACKIT Service Account Token -export TF_VAR_STACKIT_SERVICE_ACCOUNT_TOKEN= -# STACKIT ProjectID -export TF_VAR_STACKIT_PROJECT_ID= \ No newline at end of file