diff --git a/dns/dns-prod-1/terraform/apps.tf b/dns/dns-prod-1/terraform/apps.tf index 9fefd69..33c1767 100644 --- a/dns/dns-prod-1/terraform/apps.tf +++ b/dns/dns-prod-1/terraform/apps.tf @@ -1,3 +1,5 @@ +# -- databases + resource "dns_a_record_set" "db_prod_1" { zone = "home.clcreative.de." name = "db-prod-1" @@ -5,4 +7,4 @@ resource "dns_a_record_set" "db_prod_1" { "10.20.0.3" ] ttl = 3600 -} \ No newline at end of file +} diff --git a/dns/dns-prod-1/terraform/eval.tf b/dns/dns-prod-1/terraform/eval.tf deleted file mode 100644 index 41c95d9..0000000 --- a/dns/dns-prod-1/terraform/eval.tf +++ /dev/null @@ -1,6 +0,0 @@ -resource "dns_a_record_set" "test_name_1" { - zone = "home.clcreative.de." - name = "test-name-1" - addresses = ["8.8.8.8"] - ttl = 3600 -} diff --git a/dns/dns-prod-1/terraform/infra.tf b/dns/dns-prod-1/terraform/infra.tf index ed756fb..1bc1a2d 100644 --- a/dns/dns-prod-1/terraform/infra.tf +++ b/dns/dns-prod-1/terraform/infra.tf @@ -1,20 +1,4 @@ -resource "dns_a_record_set" "fw_demo_1" { - zone = "home.clcreative.de." - name = "fw-demo-1" - addresses = [ - "10.20.3.2" - ] - ttl = 3600 -} - -resource "dns_a_record_set" "fw_demo_2" { - zone = "home.clcreative.de." - name = "fw-demo-2" - addresses = [ - "10.20.3.3" - ] - ttl = 3600 -} +# -- firewalls resource "dns_a_record_set" "fw_prod_1" { zone = "home.clcreative.de." @@ -25,6 +9,8 @@ resource "dns_a_record_set" "fw_prod_1" { ttl = 3600 } +# -- proxmox servers + resource "dns_a_record_set" "prx_prod_1" { zone = "home.clcreative.de." name = "prx-prod-1" @@ -52,6 +38,8 @@ resource "dns_a_record_set" "pre_cluster_1" { ttl = 3600 } +# -- nas + resource "dns_a_record_set" "nas_prod_1" { zone = "home.clcreative.de." name = "nas-prod-1" @@ -61,6 +49,17 @@ resource "dns_a_record_set" "nas_prod_1" { ttl = 3600 } +resource "dns_a_record_set" "nas_prod_2" { + zone = "home.clcreative.de." + name = "nas-prod-2" + addresses = [ + "10.20.0.7" + ] + ttl = 3600 +} + +# -- switches + resource "dns_a_record_set" "sw_prod_1" { zone = "home.clcreative.de." name = "sw-prod-1" diff --git a/dns/dns-prod-1/terraform/kubernetes.tf b/dns/dns-prod-1/terraform/kubernetes.tf index b4f8d82..30eb9d8 100644 --- a/dns/dns-prod-1/terraform/kubernetes.tf +++ b/dns/dns-prod-1/terraform/kubernetes.tf @@ -52,15 +52,6 @@ resource "dns_a_record_set" "kube_prod_1_lb_wildcard" { ttl = 3600 } -resource "dns_a_record_set" "nas_prod_1_lb_wildcard" { - zone = "home.clcreative.de." - name = "*.nas-prod-1" - addresses = [ - "10.20.2.3" - ] - ttl = 3600 -} - # --- kube-prod-2 resource "dns_a_record_set" "kube_prod_2_lb" { diff --git a/dns/dns-prod-1/terraform/server.tf b/dns/dns-prod-1/terraform/server.tf index 6aa6498..beea44e 100644 --- a/dns/dns-prod-1/terraform/server.tf +++ b/dns/dns-prod-1/terraform/server.tf @@ -68,9 +68,6 @@ resource "dns_a_record_set" "srv_prod_7_wildcard" { ttl = 3600 } -# --- - - resource "dns_a_record_set" "srv_prod_8" { zone = "home.clcreative.de." name = "srv-prod-8" @@ -78,9 +75,6 @@ resource "dns_a_record_set" "srv_prod_8" { ttl = 3600 } -# -- kube prod 2 - - resource "dns_a_record_set" "srv_prod_9" { zone = "home.clcreative.de." name = "srv-prod-9" @@ -96,7 +90,6 @@ resource "dns_a_record_set" "srv_prod_10" { ttl = 3600 } - resource "dns_a_record_set" "srv_prod_11" { zone = "home.clcreative.de." name = "srv-prod-11" @@ -104,6 +97,8 @@ resource "dns_a_record_set" "srv_prod_11" { ttl = 3600 } +# -- testing servers + resource "dns_a_record_set" "srv_test_1" { zone = "home.clcreative.de." name = "srv-test-1" @@ -118,6 +113,7 @@ resource "dns_a_record_set" "srv_test_2" { ttl = 3600 } +# -- demo servers resource "dns_a_record_set" "srv_demo_1" { zone = "home.clcreative.de." @@ -153,38 +149,3 @@ resource "dns_a_record_set" "srv_demo_4" { addresses = ["10.20.3.6"] ttl = 3600 } - -resource "dns_a_record_set" "srv_demo_5" { - zone = "home.clcreative.de." - name = "srv-demo-5" - addresses = ["10.20.3.7"] - ttl = 3600 -} - -resource "dns_a_record_set" "srv_demo_6" { - zone = "home.clcreative.de." - name = "srv-demo-6" - addresses = ["10.20.3.8"] - ttl = 3600 -} - -resource "dns_a_record_set" "srv_demo_7" { - zone = "home.clcreative.de." - name = "srv-demo-7" - addresses = ["10.20.3.9"] - ttl = 3600 -} - -resource "dns_a_record_set" "win_demo_1" { - zone = "home.clcreative.de." - name = "win-demo-1" - addresses = ["10.20.3.10"] - ttl = 3600 -} - -resource "dns_a_record_set" "linux_demo_1" { - zone = "home.clcreative.de." - name = "linux-demo-1" - addresses = ["10.20.3.11"] - ttl = 3600 -} diff --git a/proxmox/terraform/23007-srv-demo-5.tf b/proxmox/terraform/23007-srv-demo-5.tf deleted file mode 100644 index 52f277b..0000000 --- a/proxmox/terraform/23007-srv-demo-5.tf +++ /dev/null @@ -1,56 +0,0 @@ -resource "proxmox_vm_qemu" "srv-demo-5" { - name = "srv-demo-5" - desc = "Demo Server 5, Testing Application Server, Debian" - agent = 1 - target_node = "prx-prod-2" - qemu_os = "other" # default other - bios = "seabios" # default=ovmf - tags = "test" - - define_connection_info = false - - # -- only important for full clone - # vmid = 20002 - # clone = "ubuntu-server-test-1" - # full_clone = true - full_clone = false - - # -- boot process - onboot = true - startup = "" - automatic_reboot = false # refuse auto-reboot when changing a setting - - cores = 1 - sockets = 1 - cpu = "host" - memory = 2048 - - network { - bridge = "vmbr1" - model = "virtio" - tag = -1 - } - - scsihw = "virtio-scsi-pci" # default virtio-scsi-pci - - # disk { - # storage = "pv1" - # type = "virtio" - # size = "40G" - # iothread = 1 - # } - - # -- lifecycle - lifecycle { - ignore_changes = [ - disk, - vm_state - ] - } - - # Cloud Init Settings - ipconfig0 = "ip=10.20.3.7/16,gw=10.20.0.1" - nameserver = "10.20.0.1" - ciuser = "xcad" - sshkeys = var.PUBLIC_SSH_KEY -} diff --git a/proxmox/terraform/23008-srv-demo-6.tf b/proxmox/terraform/23008-srv-demo-6.tf deleted file mode 100644 index aab23d4..0000000 --- a/proxmox/terraform/23008-srv-demo-6.tf +++ /dev/null @@ -1,56 +0,0 @@ -resource "proxmox_vm_qemu" "srv-demo-6" { - name = "srv-demo-6" - desc = "Demo Server 6, Testing Application Server, AlmaLinux" - agent = 1 - target_node = "prx-prod-2" - qemu_os = "other" # default other - bios = "seabios" # default=ovmf - tags = "test" - - define_connection_info = false - - # -- only important for full clone - # vmid = 20002 - # clone = "ubuntu-server-test-1" - # full_clone = true - full_clone = false - - # -- boot process - onboot = true - startup = "" - automatic_reboot = false # refuse auto-reboot when changing a setting - - cores = 1 - sockets = 1 - cpu = "host" - memory = 2048 - - network { - bridge = "vmbr1" - model = "virtio" - tag = -1 - } - - scsihw = "virtio-scsi-pci" # default virtio-scsi-pci - - # disk { - # storage = "pv1" - # type = "virtio" - # size = "40G" - # iothread = 1 - # } - - # -- lifecycle - lifecycle { - ignore_changes = [ - disk, - vm_state - ] - } - - # Cloud Init Settings - ipconfig0 = "ip=10.20.3.8/16,gw=10.20.0.1" - nameserver = "10.20.0.1" - ciuser = "xcad" - sshkeys = var.PUBLIC_SSH_KEY -} diff --git a/proxmox/terraform/23009-srv-demo-7.tf b/proxmox/terraform/23009-srv-demo-7.tf deleted file mode 100644 index e9eaa4a..0000000 --- a/proxmox/terraform/23009-srv-demo-7.tf +++ /dev/null @@ -1,55 +0,0 @@ -resource "proxmox_vm_qemu" "srv-demo-7" { - name = "srv-demo-7" - desc = "Demo Server 7, Testing Application Server, Ubuntu" - agent = 1 - target_node = "prx-prod-2" - qemu_os = "other" # default other - bios = "seabios" # default=ovmf - tags = "" - - define_connection_info = false - - # -- only important for full clone - vmid = 23009 - clone = "pkr-ubuntu-noble-2" - # full_clone = true - full_clone = true - - # -- boot process - onboot = true - startup = "" - automatic_reboot = false # refuse auto-reboot when changing a setting - - cores = 2 - sockets = 1 - cpu = "host" - memory = 4096 - network { - bridge = "vmbr1" - model = "virtio" - tag = -1 - } - - scsihw = "virtio-scsi-pci" # default virtio-scsi-pci - - # disk { - # storage = "pv1" - # type = "virtio" - # size = "40G" - # iothread = 1 - # } - - # -- lifecycle - lifecycle { - ignore_changes = [ - disk, - vm_state - ] - } - - # Cloud Init Settings - ipconfig0 = "ip=10.20.3.9/16,gw=10.20.0.1" - nameserver = "10.20.0.1" - ciuser = "xcad" - sshkeys = var.PUBLIC_SSH_KEY -}