diff --git a/terraform/terraform.tfstate.backup b/terraform/terraform.tfstate.backup index 22b1f0d..4a752d9 100644 --- a/terraform/terraform.tfstate.backup +++ b/terraform/terraform.tfstate.backup @@ -2,7 +2,11 @@ "version": 4, "terraform_version": "1.7.0", "serial": 17, +<<<<<<< HEAD "lineage": "96e7769d-2527-dca2-c151-a2f617b83149", +======= + "lineage": "d7f19ff0-f07f-880f-e3ac-2680451b3b6d", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "outputs": {}, "resources": [ { @@ -12,6 +16,7 @@ "provider": "provider[\"registry.terraform.io/bpg/proxmox\"]", "instances": [ { +<<<<<<< HEAD "index_key": "103", "schema_version": 0, "attributes": { @@ -423,6 +428,9 @@ }, { "index_key": "112", +======= + "index_key": "110", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "schema_version": 0, "attributes": { "clone": [], @@ -438,13 +446,22 @@ "device_passthrough": [], "disk": [ { +<<<<<<< HEAD "datastore_id": "pve2-ssd02-01", "size": 48 +======= + "datastore_id": "pve1-ssd01-01", + "size": 110 +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 } ], "features": [], "hook_script_file_id": null, +<<<<<<< HEAD "id": "112", +======= + "id": "110", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "initialization": [ { "dns": [ @@ -456,12 +473,20 @@ ] } ], +<<<<<<< HEAD "hostname": "lxc2-pve6", +======= + "hostname": "pve1-lxc2", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "ip_config": [ { "ipv4": [ { +<<<<<<< HEAD "address": "172.16.201.206/24", +======= + "address": "172.16.201.102/24", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "gateway": "172.16.201.1" } ], @@ -473,7 +498,11 @@ ], "memory": [ { +<<<<<<< HEAD "dedicated": 4096, +======= + "dedicated": 4092, +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "swap": 0 } ], @@ -488,7 +517,11 @@ "replicate": true, "shared": false, "size": "", +<<<<<<< HEAD "volume": "/mnt/ssd1/lxc6/docker" +======= + "volume": "/mnt/local_storage/lxc2/docker" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 }, { "acl": false, @@ -500,7 +533,11 @@ "replicate": true, "shared": false, "size": "", +<<<<<<< HEAD "volume": "/mnt/ssd1/lxc6/repo" +======= + "volume": "/mnt/local_storage/lxc2/repo" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 } ], "network_interface": [ @@ -508,14 +545,22 @@ "bridge": "vmbr0", "enabled": true, "firewall": false, +<<<<<<< HEAD "mac_address": "BC:24:11:68:34:3D", +======= + "mac_address": "BC:24:11:38:81:48", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "mtu": 0, "name": "eth0", "rate_limit": 0, "vlan_id": 201 } ], +<<<<<<< HEAD "node_name": "pve2", +======= + "node_name": "pve1", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "operating_system": [ { "template_file_id": "", @@ -537,13 +582,21 @@ "timeout_start": 300, "timeout_update": 1800, "unprivileged": false, +<<<<<<< HEAD "vm_id": 112 +======= + "vm_id": 110 +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 }, "sensitive_attributes": [], "private": "bnVsbA==" }, { +<<<<<<< HEAD "index_key": "114", +======= + "index_key": "116", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "schema_version": 0, "attributes": { "clone": [], @@ -551,7 +604,11 @@ "cpu": [ { "architecture": "amd64", +<<<<<<< HEAD "cores": 1, +======= + "cores": 4, +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "units": 1024 } ], @@ -559,13 +616,21 @@ "device_passthrough": [], "disk": [ { +<<<<<<< HEAD "datastore_id": "pve2-ssd01-01", +======= + "datastore_id": "pve1-hdd01-01", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "size": 8 } ], "features": [], "hook_script_file_id": null, +<<<<<<< HEAD "id": "114", +======= + "id": "116", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "initialization": [ { "dns": [ @@ -577,11 +642,16 @@ ] } ], +<<<<<<< HEAD "hostname": "pve2-lxc-terraform", +======= + "hostname": "pve1-lxc6", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "ip_config": [ { "ipv4": [ { +<<<<<<< HEAD "address": "172.16.201.12/24", "gateway": "172.16.201.21" } @@ -800,6 +870,9 @@ "ipv4": [ { "address": "172.16.201.207/24", +======= + "address": "172.16.201.106/24", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "gateway": "172.16.201.1" } ], @@ -826,7 +899,11 @@ "replicate": true, "shared": false, "size": "", +<<<<<<< HEAD "volume": "/mnt/ssd1/lxc7/docker" +======= + "volume": "" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 }, { "acl": false, @@ -838,7 +915,11 @@ "replicate": true, "shared": false, "size": "", +<<<<<<< HEAD "volume": "/mnt/ssd1/lxc7/repo" +======= + "volume": "" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 } ], "network_interface": [ @@ -846,14 +927,22 @@ "bridge": "vmbr0", "enabled": true, "firewall": false, +<<<<<<< HEAD "mac_address": "BC:24:11:80:AB:A8", +======= + "mac_address": "BC:24:11:A3:2B:B6", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "mtu": 0, "name": "eth0", "rate_limit": 0, "vlan_id": 201 } ], +<<<<<<< HEAD "node_name": "pve2", +======= + "node_name": "pve1", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 "operating_system": [ { "template_file_id": "", @@ -875,7 +964,253 @@ "timeout_start": 300, "timeout_update": 1800, "unprivileged": false, +<<<<<<< HEAD "vm_id": 117 +======= + "vm_id": 116 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + }, + { + "index_key": "118", + "schema_version": 0, + "attributes": { + "clone": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", + "cores": 4, + "units": 1024 + } + ], + "description": "", + "device_passthrough": [], + "disk": [ + { + "datastore_id": "pve1-ssd01-01", + "size": 8 + } + ], + "features": [], + "hook_script_file_id": null, + "id": "118", + "initialization": [ + { + "dns": [ + { + "domain": " ", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], + "hostname": "pve1-lxc7", + "ip_config": [ + { + "ipv4": [ + { + "address": "172.16.201.107/24", + "gateway": "172.16.201.1" + } + ], + "ipv6": [] + } + ], + "user_account": [] + } + ], + "memory": [ + { + "dedicated": 8192, + "swap": 0 + } + ], + "mount_point": [ + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/docker", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", + "volume": "/mnt/local_storage/lxc7/docker" + }, + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/repo", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", + "volume": "/mnt/local_storage/lxc7/repo" + } + ], + "network_interface": [ + { + "bridge": "vmbr0", + "enabled": true, + "firewall": false, + "mac_address": "BC:24:11:79:EB:E0", + "mtu": 0, + "name": "eth0", + "rate_limit": 0, + "vlan_id": 201 + } + ], + "node_name": "pve1", + "operating_system": [ + { + "template_file_id": "", + "type": "debian" + } + ], + "pool_id": null, + "protection": false, + "start_on_boot": true, + "started": true, + "startup": [], + "tags": [ + "docker" + ], + "template": false, + "timeout_clone": 1800, + "timeout_create": 1800, + "timeout_delete": 60, + "timeout_start": 300, + "timeout_update": 1800, + "unprivileged": false, + "vm_id": 118 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + }, + { + "index_key": "120", + "schema_version": 0, + "attributes": { + "clone": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", + "cores": 4, + "units": 1024 + } + ], + "description": "", + "device_passthrough": [], + "disk": [ + { + "datastore_id": "pve1-ssd01-01", + "size": 64 + } + ], + "features": [], + "hook_script_file_id": null, + "id": "120", + "initialization": [ + { + "dns": [ + { + "domain": " ", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], + "hostname": "pve1-lxc1", + "ip_config": [ + { + "ipv4": [ + { + "address": "172.16.201.101/24", + "gateway": "172.16.201.1" + } + ], + "ipv6": [] + } + ], + "user_account": [] + } + ], + "memory": [ + { + "dedicated": 8192, + "swap": 0 + } + ], + "mount_point": [ + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/docker", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", + "volume": "/mnt/local_storage/lxc1/docker" + }, + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/repo", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", + "volume": "/mnt/local_storage/lxc1/repo" + } + ], + "network_interface": [ + { + "bridge": "vmbr0", + "enabled": true, + "firewall": false, + "mac_address": "BC:24:11:E3:80:D3", + "mtu": 0, + "name": "eth0", + "rate_limit": 0, + "vlan_id": 201 + } + ], + "node_name": "pve1", + "operating_system": [ + { + "template_file_id": "", + "type": "debian" + } + ], + "pool_id": null, + "protection": false, + "start_on_boot": true, + "started": true, + "startup": [], + "tags": [ + "docker" + ], + "template": false, + "timeout_clone": 1800, + "timeout_create": 1800, + "timeout_delete": 60, + "timeout_start": 300, + "timeout_update": 1800, + "unprivileged": false, + "vm_id": 120 +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 }, "sensitive_attributes": [], "private": "bnVsbA==" diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars index 5b7a420..467d677 100644 --- a/terraform/terraform.tfvars +++ b/terraform/terraform.tfvars @@ -102,5 +102,57 @@ lxc_inventory = { gw = "172.16.201.1" mp0_volume = "/mnt/ssd1/lxc7/docker" mp1_volume = "/mnt/ssd1/lxc7/repo" + }, + "110" = { + node = "pve1" + hostname = "pve1-lxc2" + datastore_id = "pve1-ssd01-01" + disk_size = 110 # Match the 110G from your conf + cores = 2 + memory = 4092 + vlan = 201 + ip = "172.16.201.102/24" + gw = "172.16.201.1" + mp0_volume = "/mnt/local_storage/lxc2/docker" + mp1_volume = "/mnt/local_storage/lxc2/repo" + }, + "116" = { + node = "pve1" + hostname = "pve1-lxc6" + datastore_id = "pve1-hdd01-01" + disk_size = "8" + cores = 4 + memory = 8192 + vlan = 201 + ip = "172.16.201.106/24" + gw = "172.16.201.1" + mp0_volume = "" + mp1_volume = "" + }, + "118" = { + node = "pve1" + hostname = "pve1-lxc7" + datastore_id = "pve1-ssd01-01" + disk_size = "8" + cores = 4 + memory = 8192 + vlan = 201 + ip = "172.16.201.107/24" + gw = "172.16.201.1" + mp0_volume = "/mnt/local_storage/lxc7/docker" + mp1_volume = "/mnt/local_storage/lxc7/repo" + }, + "120" = { + node = "pve1" + hostname = "pve1-lxc1" + datastore_id = "pve1-ssd01-01" + disk_size = "64" + cores = 4 + memory = 8192 + vlan = 201 + ip = "172.16.201.101/24" + gw = "172.16.201.1" + mp0_volume = "/mnt/local_storage/lxc1/docker" + mp1_volume = "/mnt/local_storage/lxc1/repo" } }