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

This commit is contained in:
2022-11-05 13:11:08 +00:00
parent fc8f6ae53a
commit e18a59b0a5
5 changed files with 51 additions and 51 deletions

View File

@@ -16,14 +16,14 @@ format:
WORKDIR: $CI_PROJECT_DIR/terraform WORKDIR: $CI_PROJECT_DIR/terraform
allow_failure: false allow_failure: false
extends: .terraform_fmt extends: .terraform_fmt
#rules: rules:
# - if: $CI_PIPELINE_SOURCE == "merge_request_event" - if: $CI_PIPELINE_SOURCE == "merge_request_event"
# changes: changes:
# compare_to: refs/heads/main compare_to: refs/heads/main
# paths: paths:
# - 'terraform/*' - 'terraform/*'
# when: always when: always
# - when: never - when: never
plan: plan:
stage: lint stage: lint

View File

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