diff --git a/proxmox/terraform/production/production.tf b/proxmox/terraform/production/production.tf index 3898110..fcded7c 100644 --- a/proxmox/terraform/production/production.tf +++ b/proxmox/terraform/production/production.tf @@ -1,117 +1,143 @@ 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" vmid = 123 cores = "4" memory = "8192" 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" vmid = 125 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" vmid = 136 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" vmid = 139 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" vmid = 143 cores = "10" sockets = "2" memory = "65536" 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" + vmid = 141 + cores = "5" + sockets = "2" + memory = "32768" + 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 +} diff --git a/proxmox/terraform/production/terraform.tfstate b/proxmox/terraform/production/terraform.tfstate index 011ef20..129f973 100644 --- a/proxmox/terraform/production/terraform.tfstate +++ b/proxmox/terraform/production/terraform.tfstate @@ -1,529 +1,638 @@ { "version": 4, "terraform_version": "0.13.7", - "serial": 136, + "serial": 140, "lineage": "e2912de8-415d-4c35-8ee5-757008306227", - "outputs": {}, + "outputs": { + "worker18_summary": { + "value": "\nhostname: worker18\nfqdn: worker18.internal.softwareheritage.org\nnetwork: ip=192.168.100.44/24,gw=192.168.100.1 macaddrs=C6:29:D9:ED:9C:6B\n", + "type": "string" + } + }, "resources": [ { "module": "module.counters1", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.counters1.provider[\"local/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "agent": 0, "balloon": 1024, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 15, "cores": 4, "cpu": "host", "desc": "swh-counters node", "disk": [ { "backup": false, "cache": "none", "discard": "", "format": "raw", "id": 0, "iothread": false, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "replicate": false, "size": "32G", "ssd": false, "storage": "proxmox", "storage_type": "cephfs", "type": "virtio" } ], "disk_gb": 0, "force_create": false, "full_clone": false, "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/139", "ipconfig0": "ip=192.168.100.95/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "iso": null, "kvm": true, "mac": "", "memory": 2048, "name": "counters1", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "id": 0, "link_down": false, "macaddr": "26:8E:7F:D1:F7:99", "model": "virtio", "queues": -1, "rate": -1, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, "qemu_os": "other", "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", "storage": "", "storage_type": "", "target_node": "branly", "vcpus": 0, "vga": [], "vlan": -1, "vmid": 139 }, "private": "bnVsbA==" } ] }, { "module": "module.kelvingrove", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.kelvingrove.provider[\"local/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "agent": 0, "balloon": 0, "bios": "seabios", "boot": "c", "bootdisk": "virtio0", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "template-debian-10", "clone_wait": 15, "cores": 4, "cpu": "host", "desc": "Keycloak server", "disk": [ { "backup": false, "cache": "none", "discard": "", "format": "raw", "id": 0, "iothread": false, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "replicate": false, "size": "32G", "ssd": false, "storage": "proxmox", "storage_type": "cephfs", "type": "virtio" } ], "disk_gb": 0, "force_create": false, "full_clone": false, "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/123", "ipconfig0": "ip=192.168.100.106/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "iso": null, "kvm": true, "mac": "", "memory": 8192, "name": "kelvingrove", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "id": 0, "link_down": false, "macaddr": "72:55:5E:58:01:0B", "model": "virtio", "queues": -1, "rate": -1, "tag": -1 } ], "nic": "", "numa": true, "onboot": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, "qemu_os": "other", "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", "storage": "", "storage_type": "", "target_node": "branly", "vcpus": 0, "vga": [], "vlan": -1, "vmid": 123 }, "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjAifQ==" } ] }, { "module": "module.search1", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.search1.provider[\"local/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "agent": 0, "balloon": 1024, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 15, "cores": 4, "cpu": "host", "desc": "swh-search node", "disk": [ { "backup": false, "cache": "none", "discard": "", "format": "raw", "id": 0, "iothread": false, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "replicate": false, "size": "32G", "ssd": false, "storage": "proxmox", "storage_type": "cephfs", "type": "virtio" } ], "disk_gb": 0, "force_create": false, "full_clone": false, "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/136", "ipconfig0": "ip=192.168.100.85/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "iso": null, "kvm": true, "mac": "", "memory": 6144, "name": "search1", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "id": 0, "link_down": false, "macaddr": "3E:46:D3:88:44:F4", "model": "virtio", "queues": -1, "rate": -1, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, "qemu_os": "other", "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", "storage": "", "storage_type": "", "target_node": "branly", "vcpus": 0, "vga": [], "vlan": -1, "vmid": 136 }, "private": "bnVsbA==" } ] }, { "module": "module.webapp1", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.webapp1.provider[\"local/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "agent": 0, "balloon": 2048, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 15, "cores": 2, "cpu": "host", "desc": "Webapp for swh-search tests", "disk": [ { "backup": false, "cache": "none", "discard": "", "format": "raw", "id": 0, "iothread": false, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "replicate": false, "size": "32G", "ssd": false, "storage": "proxmox", "storage_type": "cephfs", "type": "virtio" } ], "disk_gb": 0, "force_create": false, "full_clone": false, "hastate": "", "hotplug": "network,disk,usb", "id": "hypervisor3/qemu/125", "ipconfig0": "ip=192.168.100.71/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "iso": null, "kvm": true, "mac": "", "memory": 8192, "name": "webapp1", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "id": 0, "link_down": false, "macaddr": "06:FF:02:95:31:CF", "model": "virtio", "queues": -1, "rate": -1, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, "qemu_os": "other", "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", "storage": "", "storage_type": "", "target_node": "hypervisor3", "vcpus": 0, "vga": [], "vlan": -1, "vmid": 125 }, "private": "bnVsbA==" } ] }, { "module": "module.worker17", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.worker17.provider[\"local/telmate/proxmox\"]", "instances": [ { "schema_version": 0, "attributes": { "agent": 0, "balloon": 1024, "bios": "seabios", "boot": "c", "bootdisk": "", "bridge": "", "ci_wait": null, "cicustom": "", "cipassword": "", "ciuser": "root", "clone": "debian-buster-2020-11-06", "clone_wait": 15, - "cores": 4, + "cores": 10, "cpu": "host", "desc": "swh-worker node (temporary)", "disk": [ { "backup": false, "cache": "none", "discard": "", "format": "raw", "id": 0, "iothread": false, "mbps": 0, "mbps_rd": 0, "mbps_rd_max": 0, "mbps_wr": 0, "mbps_wr_max": 0, "replicate": false, "size": "32G", "ssd": false, "storage": "proxmox", "storage_type": "cephfs", "type": "virtio" } ], "disk_gb": 0, "force_create": false, "full_clone": false, "hastate": "", "hotplug": "network,disk,usb", "id": "uffizi/qemu/143", "ipconfig0": "ip=192.168.100.43/24,gw=192.168.100.1", "ipconfig1": "", "ipconfig2": "", "iso": null, "kvm": true, "mac": "", "memory": 65536, "name": "worker17", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr0", "firewall": false, "id": 0, "link_down": false, "macaddr": "36:E0:2D:70:7C:52", "model": "virtio", "queues": -1, "rate": -1, "tag": -1 } ], "nic": "", "numa": false, "onboot": true, "os_network_config": null, "os_type": "cloud-init", "pool": "", "preprovision": true, "qemu_os": "other", "scsihw": "virtio-scsi-pci", "searchdomain": "softwareheritage.org", "serial": [], - "sockets": 1, + "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", + "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": "", "target_node": "uffizi", "vcpus": 0, "vga": [], "vlan": -1, "vmid": 143 }, "private": "bnVsbA==" } ] + }, + { + "module": "module.worker18", + "mode": "managed", + "type": "proxmox_vm_qemu", + "name": "node", + "provider": "module.worker18.provider[\"local/telmate/proxmox\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "agent": 0, + "balloon": 1024, + "bios": "seabios", + "boot": "c", + "bootdisk": "", + "bridge": "", + "ci_wait": null, + "cicustom": "", + "cipassword": "", + "ciuser": "root", + "clone": "debian-buster-2020-11-06", + "clone_wait": 15, + "cores": 5, + "cpu": "host", + "desc": "swh-worker node (temporary)", + "disk": [ + { + "backup": false, + "cache": "none", + "discard": "", + "format": "raw", + "id": 0, + "iothread": false, + "mbps": 0, + "mbps_rd": 0, + "mbps_rd_max": 0, + "mbps_wr": 0, + "mbps_wr_max": 0, + "replicate": false, + "size": "32G", + "ssd": false, + "storage": "proxmox", + "storage_type": "cephfs", + "type": "virtio" + } + ], + "disk_gb": 0, + "force_create": false, + "full_clone": false, + "hastate": "", + "hotplug": "network,disk,usb", + "id": "uffizi/qemu/141", + "ipconfig0": "ip=192.168.100.44/24,gw=192.168.100.1", + "ipconfig1": "", + "ipconfig2": "", + "iso": null, + "kvm": true, + "mac": "", + "memory": 32768, + "name": "worker18", + "nameserver": "192.168.100.29", + "network": [ + { + "bridge": "vmbr0", + "firewall": false, + "id": 0, + "link_down": false, + "macaddr": "C6:29:D9:ED:9C:6B", + "model": "virtio", + "queues": -1, + "rate": -1, + "tag": -1 + } + ], + "nic": "", + "numa": false, + "onboot": true, + "os_network_config": null, + "os_type": "cloud-init", + "pool": "", + "preprovision": true, + "qemu_os": "other", + "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", + "storage": "", + "storage_type": "", + "target_node": "uffizi", + "vcpus": 0, + "vga": [], + "vlan": -1, + "vmid": 141 + }, + "private": "bnVsbA==" + } + ] } ] }