diff --git a/proxmox/terraform/production/production.tf b/proxmox/terraform/production/production.tf index 87741b1..2f75610 100644 --- a/proxmox/terraform/production/production.tf +++ b/proxmox/terraform/production/production.tf @@ -1,160 +1,186 @@ locals { config = { dns = var.dns domain = "internal.softwareheritage.org" puppet_environment = "production" facter_deployment = "production" facter_subnet = "sesi_rocquencourt" puppet_master = var.puppet_master gateway_ip = "192.168.100.1" user_admin = var.user_admin user_admin_ssh_public_key = var.user_admin_ssh_public_key user_admin_ssh_private_key_path = var.user_admin_ssh_private_key_path } } module "kelvingrove" { source = "../modules/node" config = local.config hostname = "kelvingrove" description = "Keycloak server" hypervisor = "hypervisor3" cores = "4" memory = "8192" cpu = "host" numa = true balloon = 0 networks = [{ id = 0 ip = "192.168.100.106" gateway = local.config["gateway_ip"] macaddr = "72:55:5E:58:01:0B" bridge = "vmbr0" }] } module "webapp1" { source = "../modules/node" config = local.config hostname = "webapp1" description = "Webapp for swh-search tests" hypervisor = "branly" cores = "2" memory = "8192" balloon = 2048 networks = [{ id = 0 ip = "192.168.100.71" gateway = local.config["gateway_ip"] macaddr = "06:FF:02:95:31:CF" bridge = "vmbr0" }] } module "search1" { source = "../modules/node" config = local.config hostname = "search1" description = "swh-search node" hypervisor = "branly" cores = "4" memory = "6144" balloon = 1024 networks = [{ id = 0 ip = "192.168.100.85" gateway = local.config["gateway_ip"] macaddr = "3E:46:D3:88:44:F4" bridge = "vmbr0" }] } module "counters1" { source = "../modules/node" config = local.config hostname = "counters1" description = "swh-counters node" hypervisor = "branly" cores = "4" memory = "2048" balloon = 1024 networks = [{ id = 0 ip = "192.168.100.95" gateway = local.config["gateway_ip"] macaddr = "26:8E:7F:D1:F7:99" bridge = "vmbr0" }] } module "worker17" { source = "../modules/node" config = local.config hostname = "worker17" domainname = "softwareheritage.org" description = "swh-worker node (temporary)" hypervisor = "uffizi" cores = "5" sockets = "2" memory = "49152" balloon = 1024 networks = [{ id = 0 ip = "192.168.100.43" gateway = local.config["gateway_ip"] macaddr = "36:E0:2D:70:7C:52" bridge = "vmbr0" }] } module "worker18" { source = "../modules/node" config = local.config hostname = "worker18" domainname = "softwareheritage.org" description = "swh-worker node (temporary)" hypervisor = "uffizi" cores = "5" sockets = "2" memory = "49152" balloon = 1024 networks = [{ id = 0 ip = "192.168.100.44" gateway = local.config["gateway_ip"] macaddr = "C6:29:D9:ED:9C:6B" bridge = "vmbr0" }] } output "worker18_summary" { value = module.worker18.summary } - module "provenance-client01" { source = "../modules/node" config = local.config hostname = "provenance-client01" description = "Provenance client" template = "debian-bullseye-11.2-2022-01-03" hypervisor = "uffizi" cores = "4" sockets = "4" memory = "131072" balloon = 32768 networks = [{ id = 0 ip = "192.168.100.111" gateway = local.config["gateway_ip"] macaddr = null bridge = "vmbr0" }] } + +module "scrubber1" { + source = "../modules/node" + config = local.config + vmid = 153 + onboot = true + + hostname = "scrubber1" + description = "Scrubber checker services" + hypervisor = "branly" + sockets = "1" + cores = "4" + memory = "4096" + balloon = "1024" + + networks = [{ + id = 0 + ip = "192.168.100.90" + gateway = local.config["gateway_ip"] + macaddr = "B2:E5:3F:E2:77:13" + bridge = "vmbr0" + }] +} + +output "scrubber1_summary" { + value = module.scrubber1.summary +} diff --git a/proxmox/terraform/production/terraform.tfstate b/proxmox/terraform/production/terraform.tfstate index 7adaf14..860cc17 100644 --- a/proxmox/terraform/production/terraform.tfstate +++ b/proxmox/terraform/production/terraform.tfstate @@ -1,912 +1,1080 @@ { "version": 4, - "terraform_version": "1.2.2", - "serial": 147, + "terraform_version": "1.2.3", + "serial": 168, "lineage": "e2912de8-415d-4c35-8ee5-757008306227", "outputs": { + "scrubber1_summary": { + "value": "\nhostname: scrubber1\nfqdn: scrubber1.internal.softwareheritage.org\nnetwork: ip=192.168.100.90/24,gw=192.168.100.1\n", + "type": "string" + }, "worker18_summary": { "value": "\nhostname: worker18\nfqdn: worker18.internal.softwareheritage.org\nnetwork: ip=192.168.100.44/24,gw=192.168.100.1\n", "type": "string" } }, "resources": [ { "module": "module.counters1", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.counters1.provider[\"registry.terraform.io/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "additional_wait": 0, "agent": 0, "args": "", + "automatic_reboot": true, "balloon": 1024, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 0, "cloudinit_cdrom_storage": null, "cores": 4, "cpu": "kvm64", "default_ipv4_address": null, "define_connection_info": true, "desc": "swh-counters node", "disk": [ { + "aio": "", "backup": 0, "cache": "none", "discard": "", "file": "vm-139-disk-0", "format": "", "iothread": 0, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, - "media": "disk", + "media": "", "replicate": 0, "size": "32G", "slot": 0, "ssd": 0, "storage": "proxmox", "storage_type": "rbd", "type": "virtio", "volume": "proxmox:vm-139-disk-0" } ], "disk_gb": 0, "force_create": false, "force_recreate_on_change_of": null, "full_clone": false, "guest_agent_ready_timeout": 100, "hagroup": "", "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/139", "ipconfig0": "ip=192.168.100.95/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "ipconfig3": "", "ipconfig4": "", "ipconfig5": "", "iso": null, "kvm": true, "mac": "", "memory": 2048, "name": "counters1", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "link_down": false, "macaddr": "26:8E:7F:D1:F7:99", "model": "virtio", + "mtu": 0, "queues": 0, "rate": 0, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "oncreate": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, + "pxe": null, "qemu_os": "other", "reboot_required": false, "scsihw": "virtio-scsi-pci", "searchdomain": "internal.softwareheritage.org", "serial": [], "sockets": 1, "ssh_forward_ip": null, "ssh_host": "192.168.100.95", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", - "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n", "storage": "", "storage_type": "", "tablet": true, "tags": "", "target_node": "branly", "timeouts": null, "unused_disk": [ { "file": "base-10003-disk-0/vm-139-disk-0", "slot": 0, "storage": "proxmox" } ], + "usb": [], "vcpus": 0, "vga": [], "vlan": -1, "vmid": 139 }, "sensitive_attributes": [], - "private": "bnVsbA==" + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" } ] }, { "module": "module.kelvingrove", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.kelvingrove.provider[\"registry.terraform.io/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "additional_wait": 0, "agent": 0, "args": "", + "automatic_reboot": true, "balloon": 0, "bios": "seabios", "boot": "c", "bootdisk": "virtio0", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "template-debian-10", "clone_wait": 0, "cloudinit_cdrom_storage": null, "cores": 4, "cpu": "host", "default_ipv4_address": null, "define_connection_info": true, "desc": "Keycloak server", "disk": [ { + "aio": "", "backup": 0, "cache": "none", "discard": "", "file": "vm-123-disk-0", "format": "raw", "iothread": 0, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "media": "", "replicate": 0, "size": "32G", "slot": 0, "ssd": 0, "storage": "proxmox", "storage_type": "rbd", "type": "virtio", "volume": "proxmox:vm-123-disk-0" } ], "disk_gb": 0, "force_create": false, "force_recreate_on_change_of": null, "full_clone": false, "guest_agent_ready_timeout": 100, "hagroup": "", "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/123", "ipconfig0": "ip=192.168.100.106/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "ipconfig3": "", "ipconfig4": "", "ipconfig5": "", "iso": null, "kvm": true, "mac": "", "memory": 8192, "name": "kelvingrove", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "link_down": false, "macaddr": "72:55:5E:58:01:0B", "model": "virtio", + "mtu": 0, "queues": 0, "rate": 0, "tag": -1 } ], "nic": "", "numa": true, "onboot": true, "oncreate": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, + "pxe": null, "qemu_os": "other", "reboot_required": false, "scsihw": "virtio-scsi-pci", "searchdomain": "internal.softwareheritage.org", "serial": [], "sockets": 1, "ssh_forward_ip": null, "ssh_host": null, "ssh_port": null, "ssh_private_key": null, "ssh_user": "root", - "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n\n", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n\n\n", "storage": "", "storage_type": "", "tablet": true, "tags": "", "target_node": "branly", "timeouts": null, "unused_disk": [], + "usb": [], "vcpus": 0, "vga": [], "vlan": -1, "vmid": 123 }, "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" } ] }, { "module": "module.provenance-client01", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.provenance-client01.provider[\"registry.terraform.io/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "additional_wait": 0, "agent": 0, "args": "", + "automatic_reboot": true, "balloon": 32768, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-bullseye-11.2-2022-01-03", "clone_wait": 0, "cloudinit_cdrom_storage": null, "cores": 4, "cpu": "kvm64", "default_ipv4_address": null, "define_connection_info": true, "desc": "Provenance client", "disk": [ { + "aio": "", "backup": 0, "cache": "none", "discard": "", "file": "base-10006-disk-0/vm-126-disk-0", "format": "raw", "iothread": 0, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "media": "", "replicate": 0, "size": "32G", "slot": 0, "ssd": 0, "storage": "proxmox", "storage_type": "rbd", "type": "virtio", "volume": "proxmox:base-10006-disk-0/vm-126-disk-0" } ], "disk_gb": 0, "force_create": false, "force_recreate_on_change_of": null, "full_clone": false, "guest_agent_ready_timeout": 100, "hagroup": "", "hastate": "", "hotplug": "network,disk,usb", "id": "uffizi/qemu/126", "ipconfig0": "ip=192.168.100.111/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "ipconfig3": "", "ipconfig4": "", "ipconfig5": "", "iso": null, "kvm": true, "mac": "", "memory": 131072, "name": "provenance-client01", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "link_down": false, "macaddr": "36:7C:40:3D:AA:DA", "model": "virtio", + "mtu": 0, "queues": 0, "rate": 0, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "oncreate": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, + "pxe": null, "qemu_os": "other", "reboot_required": false, "scsihw": "virtio-scsi-pci", "searchdomain": "internal.softwareheritage.org", "serial": [], "sockets": 4, "ssh_forward_ip": null, "ssh_host": null, "ssh_port": null, "ssh_private_key": null, "ssh_user": "root", - "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n", "storage": "", "storage_type": "", "tablet": true, "tags": "", "target_node": "uffizi", "timeouts": null, "unused_disk": [], + "usb": [], "vcpus": 0, "vga": [], "vlan": -1, "vmid": null }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" } ] }, + { + "module": "module.scrubber1", + "mode": "managed", + "type": "proxmox_vm_qemu", + "name": "node", + "provider": "module.scrubber1.provider[\"registry.terraform.io/telmate/proxmox\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "additional_wait": 0, + "agent": 0, + "args": "", + "automatic_reboot": true, + "balloon": 1024, + "bios": "seabios", + "boot": "c", + "bootdisk": "", + "bridge": "", + "ci_wait": null, + "cicustom": "", + "cipassword": "", + "ciuser": "root", + "clone": "debian-buster-10.10-2021-09-09", + "clone_wait": 0, + "cloudinit_cdrom_storage": null, + "cores": 4, + "cpu": "kvm64", + "default_ipv4_address": null, + "define_connection_info": true, + "desc": "Scrubber checker services", + "disk": [ + { + "aio": "", + "backup": 0, + "cache": "none", + "discard": "", + "file": "base-10004-disk-0/vm-153-disk-0", + "format": "raw", + "iothread": 0, + "mbps": 0, + "mbps_rd": 0, + "mbps_rd_max": 0, + "mbps_wr": 0, + "mbps_wr_max": 0, + "media": "", + "replicate": 0, + "size": "32G", + "slot": 0, + "ssd": 0, + "storage": "proxmox", + "storage_type": "rbd", + "type": "virtio", + "volume": "proxmox:base-10004-disk-0/vm-153-disk-0" + } + ], + "disk_gb": 0, + "force_create": false, + "force_recreate_on_change_of": null, + "full_clone": false, + "guest_agent_ready_timeout": 100, + "hagroup": "", + "hastate": "", + "hotplug": "network,disk,usb", + "id": "branly/qemu/153", + "ipconfig0": "ip=192.168.100.90/24,gw=192.168.100.1", + "ipconfig1": "", + "ipconfig2": "", + "ipconfig3": "", + "ipconfig4": "", + "ipconfig5": "", + "iso": null, + "kvm": true, + "mac": "", + "memory": 4096, + "name": "scrubber1", + "nameserver": "192.168.100.29", + "network": [ + { + "bridge": "vmbr0", + "firewall": false, + "link_down": false, + "macaddr": "B2:E5:3F:E2:77:13", + "model": "virtio", + "mtu": 0, + "queues": 0, + "rate": 0, + "tag": -1 + } + ], + "nic": "", + "numa": false, + "onboot": true, + "oncreate": true, + "os_network_config": null, + "os_type": "cloud-init", + "pool": "", + "preprovision": true, + "pxe": null, + "qemu_os": "other", + "reboot_required": false, + "scsihw": "virtio-scsi-pci", + "searchdomain": "internal.softwareheritage.org", + "serial": [], + "sockets": 1, + "ssh_forward_ip": null, + "ssh_host": null, + "ssh_port": null, + "ssh_private_key": null, + "ssh_user": "root", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n", + "storage": "", + "storage_type": "", + "tablet": true, + "tags": "", + "target_node": "branly", + "timeouts": null, + "unused_disk": [], + "usb": [], + "vcpus": 0, + "vga": [], + "vlan": -1, + "vmid": 153 + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" + } + ] + }, { "module": "module.search1", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.search1.provider[\"registry.terraform.io/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "additional_wait": 0, "agent": 0, "args": "", + "automatic_reboot": true, "balloon": 1024, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 0, "cloudinit_cdrom_storage": null, "cores": 4, "cpu": "kvm64", "default_ipv4_address": null, "define_connection_info": true, "desc": "swh-search node", "disk": [ { + "aio": "", "backup": 0, "cache": "none", "discard": "", "file": "vm-136-disk-0", "format": "", "iothread": 0, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, - "media": "disk", + "media": "", "replicate": 0, "size": "32G", "slot": 0, "ssd": 0, "storage": "proxmox", "storage_type": "rbd", "type": "virtio", "volume": "proxmox:vm-136-disk-0" } ], "disk_gb": 0, "force_create": false, "force_recreate_on_change_of": null, "full_clone": false, "guest_agent_ready_timeout": 100, "hagroup": "", "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/136", "ipconfig0": "ip=192.168.100.85/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "ipconfig3": "", "ipconfig4": "", "ipconfig5": "", "iso": null, "kvm": true, "mac": "", "memory": 6144, "name": "search1", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "link_down": false, "macaddr": "3E:46:D3:88:44:F4", "model": "virtio", + "mtu": 0, "queues": 0, "rate": 0, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "oncreate": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, + "pxe": null, "qemu_os": "other", "reboot_required": false, "scsihw": "virtio-scsi-pci", "searchdomain": "internal.softwareheritage.org", "serial": [], "sockets": 1, "ssh_forward_ip": null, "ssh_host": "192.168.100.85", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", - "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n\n", "storage": "", "storage_type": "", "tablet": true, "tags": "", "target_node": "branly", "timeouts": null, "unused_disk": [ { "file": "base-10003-disk-0/vm-136-disk-0", "slot": 0, "storage": "proxmox" } ], + "usb": [], "vcpus": 0, "vga": [], "vlan": -1, "vmid": 136 }, "sensitive_attributes": [], - "private": "bnVsbA==" + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" } ] }, { "module": "module.webapp1", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.webapp1.provider[\"registry.terraform.io/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "additional_wait": 0, "agent": 0, "args": "", + "automatic_reboot": true, "balloon": 2048, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 0, "cloudinit_cdrom_storage": null, "cores": 2, "cpu": "kvm64", "default_ipv4_address": null, "define_connection_info": true, "desc": "Webapp for swh-search tests", "disk": [ { + "aio": "", "backup": 0, "cache": "none", "discard": "", "file": "vm-125-disk-0", "format": "", "iothread": 0, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, - "media": "disk", + "media": "", "replicate": 0, "size": "32G", "slot": 0, "ssd": 0, "storage": "proxmox", "storage_type": "rbd", "type": "virtio", "volume": "proxmox:vm-125-disk-0" } ], "disk_gb": 0, "force_create": false, "force_recreate_on_change_of": null, "full_clone": false, "guest_agent_ready_timeout": 100, "hagroup": "", "hastate": "", "hotplug": "network,disk,usb", "id": "hypervisor3/qemu/125", "ipconfig0": "ip=192.168.100.71/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "ipconfig3": "", "ipconfig4": "", "ipconfig5": "", "iso": null, "kvm": true, "mac": "", "memory": 8192, "name": "webapp1", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "link_down": false, "macaddr": "06:FF:02:95:31:CF", "model": "virtio", + "mtu": 0, "queues": 0, "rate": 0, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "oncreate": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, + "pxe": null, "qemu_os": "other", "reboot_required": false, "scsihw": "virtio-scsi-pci", "searchdomain": "internal.softwareheritage.org", "serial": [], "sockets": 1, "ssh_forward_ip": null, "ssh_host": "192.168.100.71", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", - "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n", "storage": "", "storage_type": "", "tablet": true, "tags": "", "target_node": "hypervisor3", "timeouts": null, "unused_disk": [ { "file": "base-10003-disk-0/vm-125-disk-0", "slot": 0, "storage": "proxmox" } ], + "usb": [], "vcpus": 0, "vga": [], "vlan": -1, "vmid": 125 }, "sensitive_attributes": [], - "private": "bnVsbA==" + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" } ] }, { "module": "module.worker17", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.worker17.provider[\"registry.terraform.io/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "additional_wait": 0, "agent": 0, "args": "", + "automatic_reboot": true, "balloon": 1024, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 0, "cloudinit_cdrom_storage": null, "cores": 5, "cpu": "kvm64", "default_ipv4_address": null, "define_connection_info": true, "desc": "swh-worker node (temporary)", "disk": [ { + "aio": "", "backup": 0, "cache": "none", "discard": "", "file": "vm-143-disk-0", "format": "", "iothread": 0, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "media": "", "replicate": 0, "size": "32G", "slot": 0, "ssd": 0, "storage": "proxmox", "storage_type": "rbd", "type": "virtio", "volume": "proxmox:vm-143-disk-0" } ], "disk_gb": 0, "force_create": false, "force_recreate_on_change_of": null, "full_clone": false, "guest_agent_ready_timeout": 100, "hagroup": "", "hastate": "", "hotplug": "network,disk,usb", "id": "uffizi/qemu/143", "ipconfig0": "ip=192.168.100.43/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "ipconfig3": "", "ipconfig4": "", "ipconfig5": "", "iso": null, "kvm": true, "mac": "", "memory": 49152, "name": "worker17", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "link_down": false, "macaddr": "36:E0:2D:70:7C:52", "model": "virtio", + "mtu": 0, "queues": 0, "rate": 0, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "oncreate": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, + "pxe": null, "qemu_os": "other", "reboot_required": false, "scsihw": "virtio-scsi-pci", "searchdomain": "softwareheritage.org", "serial": [], "sockets": 2, "ssh_forward_ip": null, "ssh_host": "192.168.100.43", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", - "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n\n", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n\n\n", "storage": "", "storage_type": "", "tablet": true, "tags": "", "target_node": "uffizi", "timeouts": null, "unused_disk": [ { "file": "base-10003-disk-0/vm-143-disk-0", "slot": 0, "storage": "proxmox" } ], + "usb": [], "vcpus": 0, "vga": [], "vlan": -1, "vmid": 143 }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" } ] }, { "module": "module.worker18", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.worker18.provider[\"registry.terraform.io/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "additional_wait": 0, "agent": 0, "args": "", + "automatic_reboot": true, "balloon": 1024, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 0, "cloudinit_cdrom_storage": null, "cores": 5, "cpu": "kvm64", "default_ipv4_address": null, "define_connection_info": true, "desc": "swh-worker node (temporary)", "disk": [ { + "aio": "", "backup": 0, "cache": "none", "discard": "", "file": "vm-141-disk-0", "format": "", "iothread": 0, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, - "media": "disk", + "media": "", "replicate": 0, "size": "32G", "slot": 0, "ssd": 0, "storage": "proxmox", "storage_type": "rbd", "type": "virtio", "volume": "proxmox:vm-141-disk-0" } ], "disk_gb": 0, "force_create": false, "force_recreate_on_change_of": null, "full_clone": false, "guest_agent_ready_timeout": 100, "hagroup": "", "hastate": "", "hotplug": "network,disk,usb", "id": "uffizi/qemu/141", "ipconfig0": "ip=192.168.100.44/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "ipconfig3": "", "ipconfig4": "", "ipconfig5": "", "iso": null, "kvm": true, "mac": "", "memory": 49152, "name": "worker18", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "link_down": false, "macaddr": "C6:29:D9:ED:9C:6B", "model": "virtio", + "mtu": 0, "queues": 0, "rate": 0, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "oncreate": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, + "pxe": null, "qemu_os": "other", "reboot_required": false, "scsihw": "virtio-scsi-pci", "searchdomain": "softwareheritage.org", "serial": [], "sockets": 2, "ssh_forward_ip": null, "ssh_host": "192.168.100.44", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", - "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n", + "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform\n\n\n", "storage": "", "storage_type": "", "tablet": true, "tags": "", "target_node": "uffizi", "timeouts": null, "unused_disk": [ { "file": "base-10003-disk-0/vm-141-disk-0", "slot": 0, "storage": "proxmox" } ], + "usb": [], "vcpus": 0, "vga": [], "vlan": -1, "vmid": 141 }, "sensitive_attributes": [], - "private": "bnVsbA==" + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlZmF1bHQiOjMwMDAwMDAwMDAwMCwiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjE4MDAwMDAwMDAwMCwidXBkYXRlIjoxODAwMDAwMDAwMDB9fQ==" } ] } ] } diff --git a/proxmox/terraform/versions.tf b/proxmox/terraform/versions.tf index de0a3fc..53a6d12 100644 --- a/proxmox/terraform/versions.tf +++ b/proxmox/terraform/versions.tf @@ -1,29 +1,29 @@ terraform { required_version = ">= 0.13" experiments = [module_variable_optional_attrs] required_providers { proxmox = { source = "telmate/proxmox" - version = "2.9.3" + version = "2.9.10" } rancher2 = { source = "rancher/rancher2" version = "1.23.0" } } } provider "proxmox" { pm_tls_insecure = true pm_api_url = "https://beaubourg.internal.softwareheritage.org:8006/api2/json" # in a shell (see README): source ../setup.sh # Uncomment this section to activate the proxmox execution logs # pm_log_enable = true # pm_log_file = "terraform-plugin-proxmox.log" # pm_debug = true # pm_log_levels = { # _default = "debug" # _capturelog = "" # } }