diff --git a/proxmox/terraform/admin/admin.tf b/proxmox/terraform/admin/admin.tf index 1c6bcc2..e1847e1 100644 --- a/proxmox/terraform/admin/admin.tf +++ b/proxmox/terraform/admin/admin.tf @@ -1,34 +1,56 @@ locals { config = { dns = var.dns domain = "internal.admin.swh.network" puppet_environment = "production" facter_deployment = "admin" facter_subnet = "sesi_rocquencourt_admin" puppet_master = var.puppet_master gateway_ip = "192.168.50.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 + vlan = "vmbr442" } } module "bardo" { source = "../modules/node" config = local.config hostname = "bardo" description = "Hedgedoc instance" hypervisor = "branly" vmid = 124 cores = "2" memory = "8192" balloon = 1024 networks = [{ id = 0 ip = "192.168.50.10" gateway = local.config["gateway_ip"] macaddr = "7A:CE:A2:72:FA:E8" - bridge = "vmbr442" + bridge = local.config["vlan"] }] } + + +module "rp1" { + source = "../modules/node" + config = local.config + + hostname = "rp1" + description = "reverse-proxy" + hypervisor = "branly" + vmid = 115 + cores = "2" + memory = "4096" + balloon = 1024 + networks = [{ + id = 0 + ip = "192.168.50.20" + gateway = local.config["gateway_ip"] + macaddr = "4E:42:20:E0:B6:65" + bridge = local.config["vlan"] + }] +} diff --git a/proxmox/terraform/admin/terraform.tfstate b/proxmox/terraform/admin/terraform.tfstate index 9badd97..9bfd055 100644 --- a/proxmox/terraform/admin/terraform.tfstate +++ b/proxmox/terraform/admin/terraform.tfstate @@ -1,113 +1,217 @@ { "version": 4, - "terraform_version": "0.13.5", - "serial": 6, + "terraform_version": "0.13.6", + "serial": 8, "lineage": "7eeb2152-4139-2f8a-fd0a-ac63e5d93d90", "outputs": {}, "resources": [ { "module": "module.bardo", "mode": "managed", "type": "proxmox_vm_qemu", "name": "node", "provider": "module.bardo.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": 2, "cpu": "host", "desc": "Hedgedoc instance", "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/124", "ipconfig0": "ip=192.168.50.10/24,gw=192.168.50.1", "ipconfig1": "", "ipconfig2": "", "iso": null, "kvm": true, "mac": "", "memory": 8192, "name": "bardo", "nameserver": "192.168.100.29", "network": [ { "bridge": "vmbr442", "firewall": false, "id": 0, "link_down": false, "macaddr": "7A:CE:A2:72:FA:E8", "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.admin.swh.network", "serial": [], "sockets": 1, "ssh_forward_ip": null, "ssh_host": "192.168.50.10", "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": "branly", "vcpus": 0, "vga": [], "vlan": -1, "vmid": 124 }, "private": "bnVsbA==" } ] + }, + { + "module": "module.rp1", + "mode": "managed", + "type": "proxmox_vm_qemu", + "name": "node", + "provider": "module.rp1.provider[\"local/telmate/proxmox\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "agent": 0, + "balloon": 1024, + "bios": "seabios", + "boot": "c", + "bootdisk": null, + "bridge": null, + "ci_wait": null, + "cicustom": null, + "cipassword": null, + "ciuser": "root", + "clone": "debian-buster-2020-11-06", + "clone_wait": 15, + "cores": 2, + "cpu": "host", + "desc": "reverse-proxy", + "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": null, + "storage": "proxmox", + "storage_type": "cephfs", + "type": "virtio" + } + ], + "disk_gb": null, + "force_create": false, + "full_clone": false, + "hastate": null, + "hotplug": "network,disk,usb", + "id": "branly/qemu/115", + "ipconfig0": "ip=192.168.50.20/24,gw=192.168.50.1", + "ipconfig1": "", + "ipconfig2": null, + "iso": null, + "kvm": true, + "mac": null, + "memory": 4096, + "name": "rp1", + "nameserver": "192.168.100.29", + "network": [ + { + "bridge": "vmbr442", + "firewall": false, + "id": 0, + "link_down": false, + "macaddr": "4E:42:20:E0:B6:65", + "model": "virtio", + "queues": -1, + "rate": -1, + "tag": -1 + } + ], + "nic": null, + "numa": false, + "onboot": true, + "os_network_config": null, + "os_type": "cloud-init", + "pool": null, + "preprovision": true, + "qemu_os": null, + "scsihw": null, + "searchdomain": "internal.admin.swh.network", + "serial": [], + "sockets": 1, + "ssh_forward_ip": null, + "ssh_host": "192.168.50.20", + "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", + "storage": null, + "storage_type": null, + "target_node": "branly", + "vcpus": 0, + "vga": [], + "vlan": -1, + "vmid": 0 + }, + "private": "bnVsbA==" + } + ] } ] }