Merge branch 'formating' into 'main'

Update .gitlab-ci.yml, terraform/defaults.tf, terraform/main.tf,...

See merge request developerdurp/homelab!6

.gitlab-ci.yml

@@ -16,14 +16,29 @@ format:
     WORKDIR: $CI_PROJECT_DIR/terraform
   allow_failure: false
   extends: .terraform_fmt
-  #rules: 
-  #  - if: $CI_PIPELINE_SOURCE == "merge_request_event"   
-  #    changes:
-  #      compare_to: refs/heads/main
-  #      paths:
-  #        - 'terraform/*'       
-  #    when: always
-  #  - when: never
+  rules: 
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"   
+      changes:
+        compare_to: refs/heads/main
+        paths:
+          - 'terraform/*'       
+      when: always
+    - when: never
+
+validate:
+  stage: lint
+  variables:
+    WORKDIR: $CI_PROJECT_DIR/terraform
+  allow_failure: false
+  extends: .terraform_validate
+  rules: 
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"   
+      changes:
+        compare_to: refs/heads/main
+        paths:
+          - 'terraform/*'       
+      when: always
+    - when: never    
 
 plan:
   stage: lint
@@ -32,6 +47,7 @@ plan:
     ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
   allow_failure: false
   extends: .terraform_plan
+  needs: ["validate","format"]
   rules: 
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"   
       changes:

terraform/main.tf

@@ -38,8 +38,8 @@ resource "proxmox_vm_qemu" "k3master" {
   #Cloud Init Settings
   ipconfig0    = "ip=192.168.20.${var.k3master.ip[count.index]}/24,gw=192.168.20.1"
   searchdomain = "durp.loc"
-  nameserver   = "${var.dnsserver}"
-  sshkeys      = "${var.sshkeys}"
+  nameserver   = var.dnsserver
+  sshkeys      = var.sshkeys
 }
 
 resource "proxmox_vm_qemu" "k3server" {
@@ -79,8 +79,8 @@ resource "proxmox_vm_qemu" "k3server" {
   #Cloud Init Settings
   ipconfig0    = "ip=192.168.20.${var.k3server.ip[count.index]}/24,gw=192.168.20.1"
   searchdomain = "durp.loc"
-  nameserver   = "${var.dnsserver}"
-  sshkeys      = "${var.sshkeys}"
+  nameserver   = var.dnsserver
+  sshkeys      = var.sshkeys
 }
 
 #kasm
@@ -123,6 +123,6 @@ resource "proxmox_vm_qemu" "kasm" {
   #Cloud Init Settings
   ipconfig0    = "ip=192.168.20.110/24,gw=192.168.20.1"
   searchdomain = "durp.loc"
-  nameserver   = "${var.dnsserver}"
-  sshkeys      = "${var.sshkeys}"
+  nameserver   = var.dnsserver
+  sshkeys      = var.sshkeys
 }

terraform/terraform.tfvars

@@ -1,4 +1,5 @@
 dnsserver = "192.168.20.1"
+
 sshkeys = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDTYqag8OKcV6kIitn3Axlyi3Xr9EeybG10wlglw34fYF0pY+OERy7zZKEju4ijZzQ7eWNlcXLYSorm5Tngkvnz4vbM4b9R7gZjTV9drSGDo0BLkMXNuSTrKwGeokcNkxh+HZcWSK4/SE5zPzvkPj1UvmAgQ4P4N79mqPe5/9gAvdrlUWEtuqVdEHc/FMk4kEZsRu4lg58KoghNCRYMYHOyd1rbHsuWpX5NumPxnosWG22jzqj46rUWEXvA7MrCGGbUDlk5+/h7Bvw4O8nGZLEo/qyaYvChTBj/UqYYBssC4VlW/SNJB1yfrklqdtcknmFVJBi174cQtzZDXOerwneh8/+t7wWpcxkWscxYrwdJspzAU/NGk02xDPaG4F1mdgZ6HIZCQAaw/EbaNbiuU+bhdngEIHUvVmdiy4T09FWIWuJxO6FnAiVIU5K8LpqGLTFp7kjOwAczdQ+KVojm/1A5W/ZoTE/y3Ni1fVaOJFCxSgU7qiKAm7hb2ZXvznNgryc="
 
 k3master = {