Page MenuHomeSoftware Heritage
Files F7163588

D6845.id24807.diff
No OneTemporary
Actions

D6845.id24807.diff
View Options

diff --git a/proxmox/terraform/admin/admin.tf b/proxmox/terraform/admin/admin.tf
--- a/proxmox/terraform/admin/admin.tf
+++ b/proxmox/terraform/admin/admin.tf
@@ -26,7 +26,6 @@
memory = "8192"
balloon = 1024
full_clone = true
- cpu = "kvm64"
networks = [{
id = 0
ip = "192.168.50.10"
@@ -49,7 +48,6 @@
memory = "4096"
balloon = 1024
full_clone = true
- cpu = "kvm64"
networks = [{
id = 0
ip = "192.168.50.20"
diff --git a/proxmox/terraform/modules/node/variables.tf b/proxmox/terraform/modules/node/variables.tf
--- a/proxmox/terraform/modules/node/variables.tf
+++ b/proxmox/terraform/modules/node/variables.tf
@@ -117,7 +117,7 @@
variable "cpu" {
description = "CPU type possible values (not exhaustive): kvm64, host, ... The default is kvm64 and must be specified to avoid issues on refresh"
type = string
- default = "host"
+ default = "kvm64"
}
variable "onboot" {
diff --git a/proxmox/terraform/production/terraform.tfstate b/proxmox/terraform/production/terraform.tfstate
--- a/proxmox/terraform/production/terraform.tfstate
+++ b/proxmox/terraform/production/terraform.tfstate
@@ -36,7 +36,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "swh-counters node",
@@ -166,7 +166,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Keycloak server",
@@ -290,7 +290,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "swh-search node",
@@ -420,7 +420,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 2,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Webapp for swh-search tests",
@@ -550,7 +550,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 10,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "swh-worker node (temporary)",
@@ -680,7 +680,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 5,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "swh-worker node (temporary)",
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": "1.1.0",
- "serial": 185,
+ "serial": 189,
"lineage": "e2912de8-415d-4c35-8ee5-757008306227",
"outputs": {
"counters0_summary": {
@@ -100,7 +100,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Counters server",
@@ -230,7 +230,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Deposit service node",
@@ -354,7 +354,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Sandbox VM to test the mirror environment",
@@ -484,7 +484,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 2,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Node to host a read-only objstorage for mirrors",
@@ -614,7 +614,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 2,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Sandbox VM to poc the rancher/kubernetes",
@@ -744,7 +744,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Sandbox staging-worker VM to run containers",
@@ -874,7 +874,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Sandbox staging-worker VM to run containers",
@@ -954,7 +954,7 @@
"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,
@@ -998,7 +998,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 2,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Node to host the reverse proxy",
@@ -1128,7 +1128,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Scheduler api services",
@@ -1252,7 +1252,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Node to host the elasticsearch instance",
@@ -1404,7 +1404,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 2,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Node to host the swh-search rpc backend service",
@@ -1534,7 +1534,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Vault services node",
@@ -1658,7 +1658,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Archive/Webapp service node",
@@ -1782,7 +1782,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Loader/lister service node",
@@ -1862,7 +1862,7 @@
"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",
+ "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\n",
"storage": "",
"storage_type": "",
"tablet": true,
@@ -1906,7 +1906,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Loader/lister service node",
@@ -1986,7 +1986,7 @@
"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",
+ "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\n",
"storage": "",
"storage_type": "",
"tablet": true,
@@ -2030,7 +2030,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Loader/lister service node",
@@ -2154,7 +2154,7 @@
"clone_wait": 0,
"cloudinit_cdrom_storage": null,
"cores": 4,
- "cpu": "host",
+ "cpu": "kvm64",
"default_ipv4_address": null,
"define_connection_info": true,
"desc": "Indexer worker",

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 30, 11:02 AM (15 h, 29 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3223755

Event Timeline

About · Developer information · Legal