diff --git a/terraform/import.sh b/terraform/import.sh new file mode 100644 index 0000000..a529878 --- /dev/null +++ b/terraform/import.sh @@ -0,0 +1,9 @@ +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["102"]' pve2/102 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["103"]' pve2/103 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["104"]' pve2/104 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["105"]' pve2/105 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["111"]' pve2/111 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["112"]' pve2/112 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["114"]' pve2/114 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["115"]' pve2/115 +terraform import -var-file="terraform.tfvars" 'proxmox_virtual_environment_container.cattle["117"]' pve2/117 diff --git a/terraform/terraform.tfstate.1769640894.backup b/terraform/terraform.tfstate.1769640894.backup deleted file mode 100644 index 096d2e1..0000000 --- a/terraform/terraform.tfstate.1769640894.backup +++ /dev/null @@ -1,623 +0,0 @@ -{ - "version": 4, - "terraform_version": "1.7.0", - "serial": 9, - "lineage": "d7f19ff0-f07f-880f-e3ac-2680451b3b6d", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "proxmox_virtual_environment_container", - "name": "cattle", - "provider": "provider[\"registry.terraform.io/bpg/proxmox\"]", - "instances": [ - { - "index_key": "101", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "cpu": [], - "description": "", - "device_passthrough": [], - "disk": [ - { - "datastore_id": "pve1-ssd01-01", - "size": 64 - } - ], - "features": [], - "hook_script_file_id": null, - "id": "101", - "initialization": [ - { - "dns": [ - { - "domain": "", - "server": "", - "servers": [ - "1.1.1.1" - ] - } - ], - "hostname": "pve1-lxc3", - "ip_config": [ - { - "ipv4": [ - { - "address": "dhcp", - "gateway": "" - } - ], - "ipv6": [] - } - ], - "user_account": [] - } - ], - "memory": [ - { - "dedicated": 512, - "swap": 512 - } - ], - "mount_point": [], - "network_interface": [ - { - "bridge": "vmbr0", - "enabled": true, - "firewall": false, - "mac_address": "BC:24:11:08:9A:80", - "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": null, - "started": false, - "startup": [], - "tags": [ - "terraform" - ], - "template": true, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - }, - { - "index_key": "110", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [], - "cpu": [ - { - "architecture": "amd64", - "cores": 2, - "units": 1024 - } - ], - "description": "", - "device_passthrough": [], - "disk": [ - { - "datastore_id": "pve1-ssd01-01", - "size": 110 - } - ], - "features": [ - { - "fuse": false, - "keyctl": true, - "mount": [], - "nesting": true - } - ], - "hook_script_file_id": null, - "id": "110", - "initialization": [ - { - "dns": [ - { - "domain": "", - "server": "", - "servers": [ - "1.1.1.1" - ] - } - ], - "hostname": "pve1-lxc2", - "ip_config": [ - { - "ipv4": [ - { - "address": "172.16.201.102/24", - "gateway": "172.16.201.1" - } - ], - "ipv6": [] - } - ], - "user_account": [] - } - ], - "memory": [ - { - "dedicated": 4092, - "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/lxc2/docker" - }, - { - "acl": false, - "backup": false, - "mount_options": [], - "path": "/repo", - "quota": false, - "read_only": false, - "replicate": true, - "shared": false, - "size": "", - "volume": "/mnt/local_storage/lxc2/repo" - } - ], - "network_interface": [ - { - "bridge": "vmbr0", - "enabled": true, - "firewall": false, - "mac_address": "BC:24:11:38:81:48", - "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": 110 - }, - "sensitive_attributes": [], - "private": "bnVsbA==" - }, - { - "index_key": "116", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "cpu": [ - { - "architecture": "amd64", - "cores": 4, - "units": 1024 - } - ], - "description": "", - "device_passthrough": [], - "disk": [ - { - "datastore_id": "pve1-hdd01-01", - "size": 8 - } - ], - "features": [], - "hook_script_file_id": null, - "id": "116", - "initialization": [ - { - "dns": [ - { - "domain": "mapletree.email", - "server": "", - "servers": [ - "1.1.1.1" - ] - } - ], - "hostname": "pve1-lxc6", - "ip_config": [ - { - "ipv4": [ - { - "address": "172.16.201.106/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/lxc6/docker" - }, - { - "acl": false, - "backup": false, - "mount_options": [], - "path": "/repo", - "quota": false, - "read_only": false, - "replicate": true, - "shared": false, - "size": "", - "volume": "/mnt/local_storage/lxc6/repo" - } - ], - "network_interface": [ - { - "bridge": "vmbr0", - "enabled": true, - "firewall": false, - "mac_address": "BC:24:11:A3:2B:B6", - "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": null, - "started": true, - "startup": [], - "tags": [ - "docker" - ], - "template": false, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - }, - { - "index_key": "118", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "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": "mapletree.email", - "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": null, - "started": true, - "startup": [], - "tags": [ - "docker" - ], - "template": false, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - }, - { - "index_key": "120", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "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": "mapletree.email", - "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": 8192 - } - ], - "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": null, - "started": true, - "startup": [], - "tags": [ - "docker" - ], - "template": false, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - } - ] - } - ], - "check_results": null -} diff --git a/terraform/terraform.tfstate.1769640961.backup b/terraform/terraform.tfstate.1769640961.backup deleted file mode 100644 index c6bc00e..0000000 --- a/terraform/terraform.tfstate.1769640961.backup +++ /dev/null @@ -1,616 +0,0 @@ -{ - "version": 4, - "terraform_version": "1.7.0", - "serial": 11, - "lineage": "d7f19ff0-f07f-880f-e3ac-2680451b3b6d", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "proxmox_virtual_environment_container", - "name": "cattle", - "provider": "provider[\"registry.terraform.io/bpg/proxmox\"]", - "instances": [ - { - "index_key": "101", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "cpu": [], - "description": "", - "device_passthrough": [], - "disk": [ - { - "datastore_id": "pve1-ssd01-01", - "size": 64 - } - ], - "features": [], - "hook_script_file_id": null, - "id": "101", - "initialization": [ - { - "dns": [ - { - "domain": "", - "server": "", - "servers": [ - "1.1.1.1" - ] - } - ], - "hostname": "pve1-lxc3", - "ip_config": [ - { - "ipv4": [ - { - "address": "dhcp", - "gateway": "" - } - ], - "ipv6": [] - } - ], - "user_account": [] - } - ], - "memory": [ - { - "dedicated": 512, - "swap": 512 - } - ], - "mount_point": [], - "network_interface": [ - { - "bridge": "vmbr0", - "enabled": true, - "firewall": false, - "mac_address": "BC:24:11:08:9A:80", - "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": null, - "started": false, - "startup": [], - "tags": [ - "terraform" - ], - "template": true, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - }, - { - "index_key": "110", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [], - "cpu": [ - { - "architecture": "amd64", - "cores": 2, - "units": 1024 - } - ], - "description": "", - "device_passthrough": [], - "disk": [ - { - "datastore_id": "pve1-ssd01-01", - "size": 110 - } - ], - "features": [], - "hook_script_file_id": null, - "id": "110", - "initialization": [ - { - "dns": [ - { - "domain": "", - "server": "", - "servers": [ - "1.1.1.1" - ] - } - ], - "hostname": "pve1-lxc2", - "ip_config": [ - { - "ipv4": [ - { - "address": "172.16.201.102/24", - "gateway": "172.16.201.1" - } - ], - "ipv6": [] - } - ], - "user_account": [] - } - ], - "memory": [ - { - "dedicated": 4092, - "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/lxc2/docker" - }, - { - "acl": false, - "backup": false, - "mount_options": [], - "path": "/repo", - "quota": false, - "read_only": false, - "replicate": true, - "shared": false, - "size": "", - "volume": "/mnt/local_storage/lxc2/repo" - } - ], - "network_interface": [ - { - "bridge": "vmbr0", - "enabled": true, - "firewall": false, - "mac_address": "BC:24:11:38:81:48", - "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": null, - "started": true, - "startup": [], - "tags": [ - "docker" - ], - "template": false, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - }, - { - "index_key": "116", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "cpu": [ - { - "architecture": "amd64", - "cores": 4, - "units": 1024 - } - ], - "description": "", - "device_passthrough": [], - "disk": [ - { - "datastore_id": "pve1-hdd01-01", - "size": 8 - } - ], - "features": [], - "hook_script_file_id": null, - "id": "116", - "initialization": [ - { - "dns": [ - { - "domain": "mapletree.email", - "server": "", - "servers": [ - "1.1.1.1" - ] - } - ], - "hostname": "pve1-lxc6", - "ip_config": [ - { - "ipv4": [ - { - "address": "172.16.201.106/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/lxc6/docker" - }, - { - "acl": false, - "backup": false, - "mount_options": [], - "path": "/repo", - "quota": false, - "read_only": false, - "replicate": true, - "shared": false, - "size": "", - "volume": "/mnt/local_storage/lxc6/repo" - } - ], - "network_interface": [ - { - "bridge": "vmbr0", - "enabled": true, - "firewall": false, - "mac_address": "BC:24:11:A3:2B:B6", - "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": null, - "started": true, - "startup": [], - "tags": [ - "docker" - ], - "template": false, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - }, - { - "index_key": "118", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "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": "mapletree.email", - "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": null, - "started": true, - "startup": [], - "tags": [ - "docker" - ], - "template": false, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - }, - { - "index_key": "120", - "schema_version": 0, - "attributes": { - "clone": [], - "console": [ - { - "enabled": true, - "tty_count": 2, - "type": "tty" - } - ], - "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": "mapletree.email", - "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": 8192 - } - ], - "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": null, - "started": true, - "startup": [], - "tags": [ - "docker" - ], - "template": false, - "timeout_clone": null, - "timeout_create": null, - "timeout_delete": null, - "timeout_start": null, - "timeout_update": null, - "unprivileged": null, - "vm_id": null - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" - } - ] - } - ], - "check_results": null -} diff --git a/terraform/terraform.tfstate.backup b/terraform/terraform.tfstate.backup index 9d295ce..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,7 +16,8 @@ "provider": "provider[\"registry.terraform.io/bpg/proxmox\"]", "instances": [ { - "index_key": "110", +<<<<<<< HEAD + "index_key": "103", "schema_version": 0, "attributes": { "clone": [], @@ -20,7 +25,7 @@ "cpu": [ { "architecture": "amd64", - "cores": 2, + "cores": 16, "units": 1024 } ], @@ -28,31 +33,31 @@ "device_passthrough": [], "disk": [ { - "datastore_id": "pve1-ssd01-01", - "size": 110 + "datastore_id": "pve2-ssd01-01", + "size": 20 } ], "features": [], "hook_script_file_id": null, - "id": "110", + "id": "103", "initialization": [ { "dns": [ { - "domain": "", + "domain": " ", "server": "", "servers": [ "1.1.1.1" ] } ], - "hostname": "pve1-lxc2", + "hostname": "pve2-lxc3", "ip_config": [ { "ipv4": [ { - "address": "172.16.201.102/24", - "gateway": "172.16.201.1" + "address": "172.16.202.22/24", + "gateway": "172.16.202.1" } ], "ipv6": [] @@ -63,49 +68,24 @@ ], "memory": [ { - "dedicated": 4092, + "dedicated": 24000, "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/lxc2/docker" - }, - { - "acl": false, - "backup": false, - "mount_options": [], - "path": "/repo", - "quota": false, - "read_only": false, - "replicate": true, - "shared": false, - "size": "", - "volume": "/mnt/local_storage/lxc2/repo" - } - ], + "mount_point": [], "network_interface": [ { "bridge": "vmbr0", "enabled": true, "firewall": false, - "mac_address": "BC:24:11:38:81:48", + "mac_address": "BC:24:11:FA:6B:7C", "mtu": 0, "name": "eth0", "rate_limit": 0, - "vlan_id": 201 + "vlan_id": 202 } ], - "node_name": "pve1", + "node_name": "pve2", "operating_system": [ { "template_file_id": "", @@ -118,7 +98,8 @@ "started": true, "startup": [], "tags": [ - "docker" + "docker", + "minecraft" ], "template": false, "timeout_clone": 1800, @@ -127,13 +108,13 @@ "timeout_start": 300, "timeout_update": 1800, "unprivileged": false, - "vm_id": 110 + "vm_id": 103 }, "sensitive_attributes": [], "private": "bnVsbA==" }, { - "index_key": "116", + "index_key": "104", "schema_version": 0, "attributes": { "clone": [], @@ -149,13 +130,13 @@ "device_passthrough": [], "disk": [ { - "datastore_id": "pve1-hdd01-01", + "datastore_id": "pve2-ssd01-01", "size": 8 } ], "features": [], "hook_script_file_id": null, - "id": "116", + "id": "104", "initialization": [ { "dns": [ @@ -167,12 +148,204 @@ ] } ], - "hostname": "pve1-lxc6", + "hostname": "pve2-lxc4", "ip_config": [ { "ipv4": [ { - "address": "172.16.201.106/24", + "address": "10.19.19.3/24", + "gateway": "10.19.19.1" + } + ], + "ipv6": [] + } + ], + "user_account": [] + } + ], + "memory": [ + { + "dedicated": 1024, + "swap": 0 + } + ], + "mount_point": [], + "network_interface": [ + { + "bridge": "vmbr0", + "enabled": true, + "firewall": false, + "mac_address": "BC:24:11:2E:C3:4A", + "mtu": 0, + "name": "eth0", + "rate_limit": 0, + "vlan_id": 0 + } + ], + "node_name": "pve2", + "operating_system": [ + { + "template_file_id": "", + "type": "debian" + } + ], + "pool_id": null, + "protection": false, + "start_on_boot": true, + "started": true, + "startup": [], + "tags": [ + "pihole" + ], + "template": false, + "timeout_clone": 1800, + "timeout_create": 1800, + "timeout_delete": 60, + "timeout_start": 300, + "timeout_update": 1800, + "unprivileged": false, + "vm_id": 104 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + }, + { + "index_key": "105", + "schema_version": 0, + "attributes": { + "clone": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", + "cores": 4, + "units": 1024 + } + ], + "description": "", + "device_passthrough": [], + "disk": [ + { + "datastore_id": "pve2-ssd01-01", + "size": 8 + } + ], + "features": [], + "hook_script_file_id": null, + "id": "105", + "initialization": [ + { + "dns": [ + { + "domain": "", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], + "hostname": "pve2-lxc5", + "ip_config": [ + { + "ipv4": [ + { + "address": "10.19.19.2/24", + "gateway": "10.19.19.1" + } + ], + "ipv6": [] + } + ], + "user_account": [] + } + ], + "memory": [ + { + "dedicated": 1024, + "swap": 0 + } + ], + "mount_point": [], + "network_interface": [ + { + "bridge": "vmbr0", + "enabled": true, + "firewall": false, + "mac_address": "BC:24:11:23:7F:D2", + "mtu": 0, + "name": "eth0", + "rate_limit": 0, + "vlan_id": 0 + } + ], + "node_name": "pve2", + "operating_system": [ + { + "template_file_id": "", + "type": "debian" + } + ], + "pool_id": null, + "protection": false, + "start_on_boot": true, + "started": true, + "startup": [], + "tags": [ + "pihole" + ], + "template": false, + "timeout_clone": 1800, + "timeout_create": 1800, + "timeout_delete": 60, + "timeout_start": 300, + "timeout_update": 1800, + "unprivileged": false, + "vm_id": 105 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + }, + { + "index_key": "111", + "schema_version": 0, + "attributes": { + "clone": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", + "cores": 4, + "units": 1024 + } + ], + "description": "", + "device_passthrough": [], + "disk": [ + { + "datastore_id": "pve2-ssd01-01", + "size": 110 + } + ], + "features": [], + "hook_script_file_id": null, + "id": "111", + "initialization": [ + { + "dns": [ + { + "domain": "", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], + "hostname": "pve2-lxc1", + "ip_config": [ + { + "ipv4": [ + { + "address": "172.16.201.201/24", "gateway": "172.16.201.1" } ], @@ -199,7 +372,7 @@ "replicate": true, "shared": false, "size": "", - "volume": "" + "volume": "/mnt/ssd1/lxc1/docker" }, { "acl": false, @@ -211,7 +384,7 @@ "replicate": true, "shared": false, "size": "", - "volume": "" + "volume": "/mnt/ssd1/lxc1/repo" } ], "network_interface": [ @@ -219,14 +392,14 @@ "bridge": "vmbr0", "enabled": true, "firewall": false, - "mac_address": "BC:24:11:A3:2B:B6", + "mac_address": "BC:24:11:72:70:1F", "mtu": 0, "name": "eth0", "rate_limit": 0, "vlan_id": 201 } ], - "node_name": "pve1", + "node_name": "pve2", "operating_system": [ { "template_file_id": "", @@ -248,6 +421,552 @@ "timeout_start": 300, "timeout_update": 1800, "unprivileged": false, + "vm_id": 111 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + }, + { + "index_key": "112", +======= + "index_key": "110", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + "schema_version": 0, + "attributes": { + "clone": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", + "cores": 2, + "units": 1024 + } + ], + "description": "", + "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": [ + { + "domain": "", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], +<<<<<<< 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" + } + ], + "ipv6": [] + } + ], + "user_account": [] + } + ], + "memory": [ + { +<<<<<<< HEAD + "dedicated": 4096, +======= + "dedicated": 4092, +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + "swap": 0 + } + ], + "mount_point": [ + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/docker", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", +<<<<<<< HEAD + "volume": "/mnt/ssd1/lxc6/docker" +======= + "volume": "/mnt/local_storage/lxc2/docker" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + }, + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/repo", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", +<<<<<<< HEAD + "volume": "/mnt/ssd1/lxc6/repo" +======= + "volume": "/mnt/local_storage/lxc2/repo" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + } + ], + "network_interface": [ + { + "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": "", + "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, +<<<<<<< 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": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", +<<<<<<< HEAD + "cores": 1, +======= + "cores": 4, +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + "units": 1024 + } + ], + "description": "", + "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": [ + { + "domain": "", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], +<<<<<<< HEAD + "hostname": "pve2-lxc-terraform", +======= + "hostname": "pve1-lxc6", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + "ip_config": [ + { + "ipv4": [ + { +<<<<<<< HEAD + "address": "172.16.201.12/24", + "gateway": "172.16.201.21" + } + ], + "ipv6": [] + } + ], + "user_account": [] + } + ], + "memory": [ + { + "dedicated": 512, + "swap": 0 + } + ], + "mount_point": [], + "network_interface": [ + { + "bridge": "vmbr0", + "enabled": true, + "firewall": false, + "mac_address": "BC:24:11:FB:17:58", + "mtu": 0, + "name": "eth0", + "rate_limit": 0, + "vlan_id": 201 + } + ], + "node_name": "pve2", + "operating_system": [ + { + "template_file_id": "", + "type": "debian" + } + ], + "pool_id": null, + "protection": false, + "start_on_boot": true, + "started": true, + "startup": [], + "tags": [ + "terraform" + ], + "template": false, + "timeout_clone": 1800, + "timeout_create": 1800, + "timeout_delete": 60, + "timeout_start": 300, + "timeout_update": 1800, + "unprivileged": false, + "vm_id": 114 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + }, + { + "index_key": "115", + "schema_version": 0, + "attributes": { + "clone": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", + "cores": 4, + "units": 1024 + } + ], + "description": "", + "device_passthrough": [], + "disk": [ + { + "datastore_id": "local", + "size": 48 + } + ], + "features": [], + "hook_script_file_id": null, + "id": "115", + "initialization": [ + { + "dns": [ + { + "domain": "", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], + "hostname": "pve2-lxc2", + "ip_config": [ + { + "ipv4": [ + { + "address": "172.16.201.202/24", + "gateway": "172.16.201.1" + } + ], + "ipv6": [] + } + ], + "user_account": [] + } + ], + "memory": [ + { + "dedicated": 48000, + "swap": 0 + } + ], + "mount_point": [ + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/docker", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", + "volume": "/pool" + }, + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/repo", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", + "volume": "/mnt/ssd1/lxc2/repo" + } + ], + "network_interface": [ + { + "bridge": "vmbr0", + "enabled": true, + "firewall": false, + "mac_address": "BC:24:11:D2:69:49", + "mtu": 0, + "name": "eth0", + "rate_limit": 0, + "vlan_id": 201 + } + ], + "node_name": "pve2", + "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": 115 + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + }, + { + "index_key": "117", + "schema_version": 0, + "attributes": { + "clone": [], + "console": [], + "cpu": [ + { + "architecture": "amd64", + "cores": 4, + "units": 1024 + } + ], + "description": "", + "device_passthrough": [], + "disk": [ + { + "datastore_id": "pve2-ssd02-01", + "size": 16 + } + ], + "features": [], + "hook_script_file_id": null, + "id": "117", + "initialization": [ + { + "dns": [ + { + "domain": " ", + "server": "", + "servers": [ + "1.1.1.1" + ] + } + ], + "hostname": "pve2-lxc7", + "ip_config": [ + { + "ipv4": [ + { + "address": "172.16.201.207/24", +======= + "address": "172.16.201.106/24", +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + "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": "", +<<<<<<< HEAD + "volume": "/mnt/ssd1/lxc7/docker" +======= + "volume": "" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + }, + { + "acl": false, + "backup": false, + "mount_options": [], + "path": "/repo", + "quota": false, + "read_only": false, + "replicate": true, + "shared": false, + "size": "", +<<<<<<< HEAD + "volume": "/mnt/ssd1/lxc7/repo" +======= + "volume": "" +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 + } + ], + "network_interface": [ + { + "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": "", + "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, +<<<<<<< HEAD + "vm_id": 117 +======= "vm_id": 116 }, "sensitive_attributes": [], @@ -491,6 +1210,7 @@ "timeout_update": 1800, "unprivileged": false, "vm_id": 120 +>>>>>>> 7fdf56c0eb4146a0b0af8aee997e70b276cdd5d0 }, "sensitive_attributes": [], "private": "bnVsbA==" diff --git a/terraform/terraform.tfvars b/terraform/terraform.tfvars index 5e63aaf..d612173 100644 --- a/terraform/terraform.tfvars +++ b/terraform/terraform.tfvars @@ -1,4 +1,108 @@ lxc_inventory = { + "103" = { + node = "pve2" + hostname = "pve2-lxc3" + datastore_id = "pve2-ssd01-01" + disk_size = "20" + cores = 16 + memory = 24000 + vlan = 202 + ip = "172.16.202.22/24" + gw = "172.16.202.1" + mp0_volume = "" + mp1_volume = "" + }, + "104" = { + node = "pve2" + hostname = "pve2-lxc4" + datastore_id = "pve2-ssd01-01" + disk_size = "8" + cores = 4 + memory = 1024 + vlan = "0" + ip = "10.19.19.3/24" + gw = "10.19.19.1" + mp0_volume = "" + mp1_volume = "" + }, + "105" = { + node = "pve2" + hostname = "pve2-lxc5" + datastore_id = "pve2-ssd01-01" + disk_size = "8" + cores = 4 + memory = 1024 + vlan = "0" + ip = "10.19.19.2/24" + gw = "10.19.19.1" + mp0_volume = "" + mp1_volume = "" + }, + "111" = { + node = "pve2" + hostname = "pve2-lxc1" + datastore_id = "pve2-ssd01-01" + disk_size = "110" + cores = 4 + memory = 8192 + vlan = 201 + ip = "172.16.201.201/24" + gw = "172.16.201.1" + mp0_volume = "/mnt/ssd1/lxc1/docker" + mp1_volume = "/mnt/ssd1/lxc1/repo" + }, + "112" = { + node = "pve2" + hostname = "lxc2-pve6" + datastore_id = "pve2-ssd02-01" + disk_size = "48" + cores = 2 + memory = 4096 + vlan = 201 + ip = "172.16.201.206/24" + gw = "172.16.201.1" + mp0_volume = "/mnt/ssd1/lxc6/docker" + mp1_volume = "/mnt/ssd1/lxc6/repo" + }, + "114" = { + node = "pve2" + hostname = "pve2-lxc-terraform" + datastore_id = "pve2-ssd01-01" + disk_size = "8" + cores = 1 + memory = 512 + vlan = 201 + ip = "172.16.201.12/24" + gw = "172.16.201.21" + mp0_volume = "" + mp1_volume = "" + }, + "115" = { + node = "pve2" + hostname = "pve2-lxc2" + datastore_id = "local" + disk_size = "48" + cores = 4 + memory = 48000 + vlan = 201 + ip = "172.16.201.202/24" + gw = "172.16.201.1" + mp0_volume = "/pool" + mp1_volume = "/mnt/ssd1/lxc2/repo" + }, + "117" = { + node = "pve2" + hostname = "pve2-lxc7" + datastore_id = "pve2-ssd02-01" + disk_size = "16" + cores = 4 + memory = 8192 + vlan = 201 + ip = "172.16.201.207/24" + gw = "172.16.201.1" + mp0_volume = "/mnt/ssd1/lxc7/docker" + mp1_volume = "/mnt/ssd1/lxc7/repo" + }, "110" = { node = "pve1" hostname = "pve1-lxc2"