Skip to content

Commit 7727fdf

Browse files
committedOct 12, 2024
fix up things
1 parent 3e0a1bf commit 7727fdf

File tree

8 files changed

+55
-176
lines changed

8 files changed

+55
-176
lines changed
 

‎terraform/AI.tf

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎terraform/NAS.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ resource "proxmox_virtual_environment_vm" "TrueNAS" {
1010
"debian",
1111
"infrastructure",
1212
]
13+
14+
agent {
15+
enabled = true
16+
type = "virtio"
17+
}
1318

1419
# CPU Settings
1520
cpu {

‎terraform/kasm.tf

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,4 @@ resource "proxmox_virtual_environment_vm" "Kasm" {
5959
initialization[0].user_data_file_id
6060
]
6161
}
62-
63-
provisioner "remote-exec" {
64-
inline = [
65-
"cd /home/mafyuh/iac/docker/kasm",
66-
"git pull",
67-
"docker compose up -d"
68-
]
69-
connection {
70-
type = "ssh"
71-
user = "mafyuh"
72-
private_key = file("/home/mafyuh/.ssh/id_rsa")
73-
host = var.kasm_ssh_ip
74-
}
75-
}
7662
}

‎terraform/provider.tf

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,46 @@
11
terraform {
2+
required_providers {
3+
proxmox = {
4+
source = "bpg/proxmox"
5+
version = ">= 0.65.0"
6+
}
7+
}
28

3-
required_providers {
4-
proxmox = {
5-
source = "bpg/proxmox"
6-
version = ">= 0.60.1"
7-
}
9+
backend "s3" {
10+
bucket = "BigBuckets"
11+
region = "us-ashburn-1"
12+
key = "tf.tfstate"
13+
skip_region_validation = true
14+
skip_credentials_validation = true
15+
skip_requesting_account_id = true
16+
use_path_style = true
17+
skip_s3_checksum = true
18+
skip_metadata_api_check = true
19+
endpoints = {
20+
s3 = "https://id8kdbgzbggf.compat.objectstorage.us-ashburn-1.oraclecloud.com"
821
}
22+
}
923
}
1024

1125
provider "proxmox" {
12-
endpoint = var.virtual_environment_endpoint
13-
password = var.ssh_password
14-
username = "root@pam"
15-
insecure = true
16-
26+
endpoint = var.virtual_environment_endpoint
27+
password = var.ssh_password
28+
username = "root@pam"
29+
insecure = true
30+
1731
ssh {
1832
agent = true
19-
username = "root"
20-
password = var.ssh_password
33+
username = "root"
34+
password = var.ssh_password
35+
36+
node {
37+
name = "prox"
38+
address = var.prox_ip_address
39+
}
40+
2141
node {
22-
name = "prox"
23-
address = var.prox_ip_address
42+
name = "pve2"
43+
address = var.pve2_ip_address
2444
}
2545
}
2646
}

‎terraform/ubuntu22-template.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,11 @@ vga {
3737
type = "serial0"
3838
}
3939

40+
cpu {
41+
cores = 2
42+
type = "host"
43+
architecture = "x86_64"
44+
}
4045
}
46+
47+

‎terraform/ubuntu22-template2.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,9 @@ vga {
3737
type = "serial0"
3838
}
3939

40+
cpu {
41+
cores = 2
42+
type = "host"
43+
architecture = "x86_64"
44+
}
4045
}

‎terraform/vars.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,8 @@ variable "kasm_ssh_ip" {
5656

5757
variable "ubu_ip_address" {
5858
type = string
59+
}
60+
61+
variable "pve2_ip_address" {
62+
type = string
5963
}

‎terraform/whisper.tf

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.