diff --git a/proxmox/terraform/staging/staging.tf b/proxmox/terraform/staging/staging.tf --- a/proxmox/terraform/staging/staging.tf +++ b/proxmox/terraform/staging/staging.tf @@ -189,41 +189,6 @@ value = module.vault.summary } -module "journal0" { - source = "../modules/node" - config = local.config - - vmid = 122 - hostname = "journal0" - description = "Journal services node" - hypervisor = "beaubourg" - cores = "4" - memory = "20000" - balloon = 1024 - networks = [{ - id = 0 - ip = "192.168.130.70" - gateway = local.config["gateway_ip"] - macaddr = "1E:98:C2:66:BF:33" - bridge = "vmbr443" - }] - storages = [{ - id = 0 - storage = "proxmox" - size = "32G" - storage_type = "cephfs" - }, { - id = 1 - storage = "proxmox" - size = "500G" - storage_type = "cephfs" - }] - cicustom = "user=proxmox-cephfs:snippets/journal0.ciconfig.user.yml" -} - -output "journal0_summary" { - value = module.journal0.summary -} module "rp0" { source = "../modules/node" diff --git a/proxmox/terraform/staging/terraform.tfstate b/proxmox/terraform/staging/terraform.tfstate --- a/proxmox/terraform/staging/terraform.tfstate +++ b/proxmox/terraform/staging/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, - "terraform_version": "0.13.7", - "serial": 163, + "terraform_version": "1.0.7", + "serial": 167, "lineage": "e2912de8-415d-4c35-8ee5-757008306227", "outputs": { "counters0_summary": { @@ -12,10 +12,6 @@ "value": "\nhostname: deposit\nfqdn: deposit.internal.staging.swh.network\nnetwork: ip=192.168.130.31/24,gw=192.168.130.1 macaddrs=9E:81:DD:58:15:3B\n", "type": "string" }, - "journal0_summary": { - "value": "\nhostname: journal0\nfqdn: journal0.internal.staging.swh.network\nnetwork: ip=192.168.130.70/24,gw=192.168.130.1 macaddrs=1E:98:C2:66:BF:33\n", - "type": "string" - }, "mirror-tests_summary": { "value": "\nhostname: mirror-test\nfqdn: mirror-test.internal.staging.swh.network\nnetwork: ip=192.168.130.160/24,gw=192.168.130.1 macaddrs=E6:3C:8A:B7:26:5D\n", "type": "string" @@ -25,11 +21,11 @@ "type": "string" }, "poc-rancher-sw0_summary": { - "value": "\nhostname: poc-rancher-sw0\nfqdn: poc-rancher-sw0.internal.staging.swh.network\nnetwork: ip=192.168.130.163/24,gw=192.168.130.1 macaddrs=2A:F4:DE:3A:26:7C\n", + "value": "\nhostname: poc-rancher-sw0\nfqdn: poc-rancher-sw0.internal.staging.swh.network\nnetwork: ip=192.168.130.163/24,gw=192.168.130.1 macaddrs=5A:32:B6:FC:8D:F4\n", "type": "string" }, "poc-rancher-sw1_summary": { - "value": "\nhostname: poc-rancher-sw1\nfqdn: poc-rancher-sw1.internal.staging.swh.network\nnetwork: ip=192.168.130.164/24,gw=192.168.130.1 macaddrs=4A:31:28:30:9F:C8\n", + "value": "\nhostname: poc-rancher-sw1\nfqdn: poc-rancher-sw1.internal.staging.swh.network\nnetwork: ip=192.168.130.164/24,gw=192.168.130.1 macaddrs=06:32:6D:D8:9A:0B\n", "type": "string" }, "poc-rancher_summary": { @@ -178,6 +174,7 @@ "vlan": -1, "vmid": 138 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -282,129 +279,7 @@ "vlan": -1, "vmid": 120 }, - "private": "bnVsbA==" - } - ] - }, - { - "module": "module.journal0", - "mode": "managed", - "type": "proxmox_vm_qemu", - "name": "node", - "provider": "module.journal0.provider[\"local/telmate/proxmox\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "agent": 0, - "balloon": 1024, - "bios": "seabios", - "boot": "c", - "bootdisk": "virtio0", - "bridge": "", - "ci_wait": null, - "cicustom": "user=proxmox-cephfs:snippets/journal0.ciconfig.user.yml", - "cipassword": "", - "ciuser": "root", - "clone": "template-debian-10", - "clone_wait": 15, - "cores": 4, - "cpu": "host", - "desc": "Journal services 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" - }, - { - "backup": false, - "cache": "none", - "discard": "", - "format": "raw", - "id": 1, - "iothread": false, - "mbps": 0, - "mbps_rd": 0, - "mbps_rd_max": 0, - "mbps_wr": 0, - "mbps_wr_max": 0, - "replicate": false, - "size": "500G", - "ssd": false, - "storage": "proxmox", - "storage_type": "cephfs", - "type": "virtio" - } - ], - "disk_gb": 0, - "force_create": false, - "full_clone": false, - "hastate": "", - "hotplug": "network,disk,usb", - "id": "pompidou/qemu/122", - "ipconfig0": "ip=192.168.130.70/24,gw=192.168.130.1", - "ipconfig1": "", - "ipconfig2": "", - "iso": null, - "kvm": true, - "mac": "", - "memory": 20000, - "name": "journal0", - "nameserver": "192.168.100.29", - "network": [ - { - "bridge": "vmbr443", - "firewall": false, - "id": 0, - "link_down": false, - "macaddr": "1E:98:C2:66:BF:33", - "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.staging.swh.network", - "serial": [], - "sockets": 1, - "ssh_forward_ip": null, - "ssh_host": "192.168.130.70", - "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\n\n", - "storage": "", - "storage_type": "", - "target_node": "pompidou", - "vcpus": 0, - "vga": [], - "vlan": -1, - "vmid": 122 - }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -509,6 +384,7 @@ "vlan": -1, "vmid": 132 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -613,6 +489,7 @@ "vlan": -1, "vmid": 102 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -717,6 +594,7 @@ "vlan": -1, "vmid": 114 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -741,7 +619,7 @@ "cicustom": "", "cipassword": "", "ciuser": "root", - "clone": "debian-bullseye-11.0-2021-09-09", + "clone": "debian-buster-2020-11-06", "clone_wait": 15, "cores": 5, "cpu": "host", @@ -788,7 +666,7 @@ "firewall": false, "id": 0, "link_down": false, - "macaddr": "2A:F4:DE:3A:26:7C", + "macaddr": "5A:32:B6:FC:8D:F4", "model": "virtio", "queues": -1, "rate": -1, @@ -821,6 +699,7 @@ "vlan": -1, "vmid": 135 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -839,13 +718,13 @@ "balloon": 65536, "bios": "seabios", "boot": "c", - "bootdisk": "", - "bridge": "", + "bootdisk": null, + "bridge": null, "ci_wait": null, "cicustom": "", - "cipassword": "", + "cipassword": null, "ciuser": "root", - "clone": "debian-bullseye-11.0-2021-09-09", + "clone": "debian-buster-2020-11-06", "clone_wait": 15, "cores": 5, "cpu": "host", @@ -865,24 +744,24 @@ "mbps_wr_max": 0, "replicate": false, "size": "32G", - "ssd": false, + "ssd": null, "storage": "proxmox", "storage_type": "cephfs", "type": "virtio" } ], - "disk_gb": 0, + "disk_gb": null, "force_create": false, "full_clone": false, - "hastate": "", + "hastate": null, "hotplug": "network,disk,usb", "id": "uffizi/qemu/134", "ipconfig0": "ip=192.168.130.164/24,gw=192.168.130.1", "ipconfig1": "", - "ipconfig2": "", + "ipconfig2": null, "iso": null, "kvm": true, - "mac": "", + "mac": null, "memory": 65536, "name": "poc-rancher-sw1", "nameserver": "192.168.100.29", @@ -892,22 +771,22 @@ "firewall": false, "id": 0, "link_down": false, - "macaddr": "4A:31:28:30:9F:C8", + "macaddr": "06:32:6D:D8:9A:0B", "model": "virtio", "queues": -1, "rate": -1, "tag": -1 } ], - "nic": "", + "nic": null, "numa": false, "onboot": true, "os_network_config": null, "os_type": "cloud-init", - "pool": "", + "pool": null, "preprovision": true, - "qemu_os": "other", - "scsihw": "virtio-scsi-pci", + "qemu_os": null, + "scsihw": null, "searchdomain": "internal.staging.swh.network", "serial": [], "sockets": 2, @@ -916,15 +795,16 @@ "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": "", + "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": "uffizi", "vcpus": 0, "vga": [], "vlan": -1, - "vmid": 134 + "vmid": 0 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1029,6 +909,7 @@ "vlan": -1, "vmid": 129 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1133,6 +1014,7 @@ "vlan": -1, "vmid": 116 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1256,6 +1138,7 @@ "vlan": -1, "vmid": 130 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1360,6 +1243,7 @@ "vlan": -1, "vmid": 131 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1464,6 +1348,7 @@ "vlan": -1, "vmid": 121 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1568,6 +1453,7 @@ "vlan": -1, "vmid": 119 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1672,6 +1558,7 @@ "vlan": -1, "vmid": 117 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1776,6 +1663,7 @@ "vlan": -1, "vmid": 118 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1880,6 +1768,7 @@ "vlan": -1, "vmid": 112 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ] @@ -1984,6 +1873,7 @@ "vlan": -1, "vmid": 137 }, + "sensitive_attributes": [], "private": "bnVsbA==" } ]