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 @@ -17,47 +17,6 @@ } } -module "gateway" { - source = "../modules/node" - config = local.config - hypervisor = "beaubourg" - - vmid = 109 - hostname = "gateway" - description = "staging gateway node" - cores = "1" - memory = "1024" - networks = [ - { - id = 0 - ip = "192.168.100.125" - gateway = "192.168.100.1" - bridge = "vmbr0" - macaddr = "6E:ED:EF:EB:3C:AA" - }, - { - id = 1 - ip = local.config["gateway_ip"] - gateway = "" - bridge = "vmbr443" - macaddr = "FE:95:CC:A5:EB:43" - } - ] - storages = [ - { - id = 0 - storage = "proxmox" - storage_type = "cephfs" - size = "20G" - } - ] - pre_provision_steps = [ - "sysctl -w net.ipv4.ip_forward=1", - "sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/g' /etc/sysctl.conf", - "iptables -t nat -A POSTROUTING -s 192.168.128.0/24 -o eth0 -j MASQUERADE", - ] -} - module "storage0" { source = "../modules/node" config = local.config @@ -71,7 +30,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.2" + ip = "192.168.130.40" gateway = local.config["gateway_ip"] macaddr = "CA:73:7F:ED:F9:01" bridge = "vmbr443" @@ -84,7 +43,7 @@ }, { id = 1 storage = "orsay-ssd-2018" - size = "512G" + size = "812G" storage_type = "ssd" }] } @@ -102,7 +61,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.3" + ip = "192.168.130.10" gateway = local.config["gateway_ip"] macaddr = "3A:65:31:7C:24:17" bridge = "vmbr443" @@ -133,7 +92,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.4" + ip = "192.168.130.50" gateway = local.config["gateway_ip"] macaddr = "92:02:7E:D0:B9:36" bridge = "vmbr443" @@ -157,7 +116,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.5" + ip = "192.168.130.100" gateway = local.config["gateway_ip"] macaddr = "72:D9:03:46:B1:47" bridge = "vmbr443" @@ -181,7 +140,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.6" + ip = "192.168.130.101" gateway = local.config["gateway_ip"] macaddr = "D6:A9:6F:02:E3:66" bridge = "vmbr443" @@ -192,6 +151,30 @@ value = module.worker1.summary } +module "worker2" { + source = "../modules/node" + config = local.config + + vmid = 112 + hostname = "worker2" + description = "Loader/lister service node" + hypervisor = "branly" + cores = "4" + memory = "12288" + balloon = 1024 + networks = [{ + id = 0 + ip = "192.168.130.102" + gateway = local.config["gateway_ip"] + macaddr = "AA:57:27:51:75:18" + bridge = "vmbr443" + }] +} + +output "worker2_summary" { + value = module.worker2.summary +} + module "webapp" { source = "../modules/node" config = local.config @@ -205,7 +188,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.8" + ip = "192.168.130.30" gateway = local.config["gateway_ip"] macaddr = "1A:00:39:95:D4:5F" bridge = "vmbr443" @@ -229,7 +212,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.7" + ip = "192.168.130.31" gateway = local.config["gateway_ip"] macaddr = "9E:81:DD:58:15:3B" bridge = "vmbr443" @@ -253,7 +236,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.9" + ip = "192.168.130.60" gateway = local.config["gateway_ip"] macaddr = "16:15:1C:79:CB:DB" bridge = "vmbr443" @@ -277,7 +260,7 @@ balloon = 1024 networks = [{ id = 0 - ip = "192.168.128.10" + ip = "192.168.130.70" gateway = local.config["gateway_ip"] macaddr = "1E:98:C2:66:BF:33" bridge = "vmbr443" @@ -287,27 +270,3 @@ output "journal0_summary" { value = module.journal0.summary } - -module "worker2" { - source = "../modules/node" - config = local.config - - vmid = 112 - hostname = "worker2" - description = "Loader/lister service node" - hypervisor = "branly" - cores = "4" - memory = "12288" - balloon = 1024 - networks = [{ - id = 0 - ip = "192.168.128.11" - gateway = local.config["gateway_ip"] - macaddr = "AA:57:27:51:75:18" - bridge = "vmbr443" - }] -} - -output "worker2_summary" { - value = module.worker2.summary -} 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 @@ -5,39 +5,39 @@ "lineage": "e2912de8-415d-4c35-8ee5-757008306227", "outputs": { "db0_summary": { - "value": "\nhostname: db0\nfqdn: db0.internal.staging.swh.network\nnetwork: ip=192.168.128.3/24,gw=192.168.128.1 macaddrs=3A:65:31:7C:24:17\n", + "value": "\nhostname: db0\nfqdn: db0.internal.staging.swh.network\nnetwork: ip=192.168.130.10/24,gw=192.168.130.1 macaddrs=3A:65:31:7C:24:17\n", "type": "string" }, "deposit_summary": { - "value": "\nhostname: deposit\nfqdn: deposit.internal.staging.swh.network\nnetwork: ip=192.168.128.7/24,gw=192.168.128.1 macaddrs=9E:81:DD:58:15:3B\n", + "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.128.10/24,gw=192.168.128.1 macaddrs=1E:98:C2:66:BF:33\n", + "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" }, "scheduler0_summary": { - "value": "\nhostname: scheduler0\nfqdn: scheduler0.internal.staging.swh.network\nnetwork: ip=192.168.128.4/24,gw=192.168.128.1 macaddrs=92:02:7E:D0:B9:36\n", + "value": "\nhostname: scheduler0\nfqdn: scheduler0.internal.staging.swh.network\nnetwork: ip=192.168.130.50/24,gw=192.168.130.1 macaddrs=92:02:7E:D0:B9:36\n", "type": "string" }, "vault_summary": { - "value": "\nhostname: vault\nfqdn: vault.internal.staging.swh.network\nnetwork: ip=192.168.128.9/24,gw=192.168.128.1 macaddrs=16:15:1C:79:CB:DB\n", + "value": "\nhostname: vault\nfqdn: vault.internal.staging.swh.network\nnetwork: ip=192.168.130.60/24,gw=192.168.130.1 macaddrs=16:15:1C:79:CB:DB\n", "type": "string" }, "webapp_summary": { - "value": "\nhostname: webapp\nfqdn: webapp.internal.staging.swh.network\nnetwork: ip=192.168.128.8/24,gw=192.168.128.1 macaddrs=1A:00:39:95:D4:5F\n", + "value": "\nhostname: webapp\nfqdn: webapp.internal.staging.swh.network\nnetwork: ip=192.168.130.30/24,gw=192.168.130.1 macaddrs=1A:00:39:95:D4:5F\n", "type": "string" }, "worker0_summary": { - "value": "\nhostname: worker0\nfqdn: worker0.internal.staging.swh.network\nnetwork: ip=192.168.128.5/24,gw=192.168.128.1 macaddrs=72:D9:03:46:B1:47\n", + "value": "\nhostname: worker0\nfqdn: worker0.internal.staging.swh.network\nnetwork: ip=192.168.130.100/24,gw=192.168.130.1 macaddrs=72:D9:03:46:B1:47\n", "type": "string" }, "worker1_summary": { - "value": "\nhostname: worker1\nfqdn: worker1.internal.staging.swh.network\nnetwork: ip=192.168.128.6/24,gw=192.168.128.1 macaddrs=D6:A9:6F:02:E3:66\n", + "value": "\nhostname: worker1\nfqdn: worker1.internal.staging.swh.network\nnetwork: ip=192.168.130.101/24,gw=192.168.130.1 macaddrs=D6:A9:6F:02:E3:66\n", "type": "string" }, "worker2_summary": { - "value": "\nhostname: worker2\nfqdn: worker2.internal.staging.swh.network\nnetwork: ip=192.168.128.11/24,gw=192.168.128.1 macaddrs=AA:57:27:51:75:18\n", + "value": "\nhostname: worker2\nfqdn: worker2.internal.staging.swh.network\nnetwork: ip=192.168.130.102/24,gw=192.168.130.1 macaddrs=AA:57:27:51:75:18\n", "type": "string" } }, @@ -209,7 +209,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "orsay/qemu/115", - "ipconfig0": "ip=192.168.128.3/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.10/24,gw=192.168.130.10", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -313,7 +313,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "beaubourg/qemu/120", - "ipconfig0": "ip=192.168.128.7/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.31/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -348,7 +348,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.7", + "ssh_host": "192.168.130.31", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", @@ -417,7 +417,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "beaubourg/qemu/122", - "ipconfig0": "ip=192.168.128.10/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.70/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -452,7 +452,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.10", + "ssh_host": "192.168.130.70", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", @@ -521,7 +521,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "beaubourg/qemu/116", - "ipconfig0": "ip=192.168.128.4/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.50/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -556,7 +556,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.4", + "ssh_host": "192.168.130.50", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", @@ -631,7 +631,7 @@ "mbps_wr": 0, "mbps_wr_max": 0, "replicate": false, - "size": "512G", + "size": "812G", "ssd": false, "storage": "orsay-ssd-2018", "storage_type": "ssd", @@ -644,7 +644,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "orsay/qemu/114", - "ipconfig0": "ip=192.168.128.2/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.40/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -748,7 +748,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "beaubourg/qemu/121", - "ipconfig0": "ip=192.168.128.9/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.60/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -783,7 +783,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.9", + "ssh_host": "192.168.130.60", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", @@ -852,7 +852,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/119", - "ipconfig0": "ip=192.168.128.8/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.30/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -887,7 +887,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.8", + "ssh_host": "192.168.130.30", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", @@ -956,7 +956,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "beaubourg/qemu/117", - "ipconfig0": "ip=192.168.128.5/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.100/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -991,7 +991,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.5", + "ssh_host": "192.168.130.100", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", @@ -1060,7 +1060,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "beaubourg/qemu/118", - "ipconfig0": "ip=192.168.128.6/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.101/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -1095,7 +1095,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.6", + "ssh_host": "192.168.130.101", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", @@ -1164,7 +1164,7 @@ "hastate": "", "hotplug": "network,disk,usb", "id": "branly/qemu/112", - "ipconfig0": "ip=192.168.128.11/24,gw=192.168.128.1", + "ipconfig0": "ip=192.168.130.102/24,gw=192.168.130.1", "ipconfig1": "", "ipconfig2": "", "iso": null, @@ -1199,7 +1199,7 @@ "serial": [], "sockets": 1, "ssh_forward_ip": null, - "ssh_host": "192.168.128.11", + "ssh_host": "192.168.130.102", "ssh_port": "22", "ssh_private_key": null, "ssh_user": "root", diff --git a/proxmox/terraform/variables.tf b/proxmox/terraform/variables.tf --- a/proxmox/terraform/variables.tf +++ b/proxmox/terraform/variables.tf @@ -25,7 +25,7 @@ variable "gateway_ip" { description = "Staging network gateway ip" type = string - default = "192.168.128.1" + default = "192.168.130.1" } variable "user_admin" { @@ -40,4 +40,3 @@ type = string default = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVKCfpeIMg7GS3Pk03ZAcBWAeDZ+AvWk2k/pPY0z8MJ3YAbqZkRtSK7yaDgJV6Gro7nn/TxdJLo2jEzzWvlC8d8AEzhZPy5Z/qfVVjqBTBM4H5+e+TItAHFfaY5+0WvIahxcfsfaq70MWfpJhszAah3ThJ4mqzYaw+dkr42+a7Gx3Ygpb/m2dpnFnxvXdcuAJYStmHKU5AWGWWM+Fm50/fdMqUfNd8MbKhkJt5ihXQmZWMOt7ls4N8i5NZWnS9YSWow8X/ENOEqCRN9TyRkc+pPS0w9DNi0BCsWvSRJOkyvQ6caEnKWlNoywCmM1AlIQD3k4RUgRWe0vqg/UKPpH3Z root@terraform" } -