From b915cbb94972b7a68cabf5195c04bf358b4a331f Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 29 Nov 2023 18:49:21 +0100 Subject: [PATCH] Fix the vrrp IP addresses in preprod. --- .../basic-infrastructure/terraform.tfstate | 106 +++++++++--------- .../d4s-preprod/variables/preprod.auto.tfvars | 4 +- .../variables/variables-preprod.tf | 4 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate b/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate index 6c3c5645..9cc638af 100644 --- a/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate +++ b/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.4", - "serial": 219, + "serial": 250, "lineage": "6a53b692-c1a8-ed53-bc6c-b7fb5e017eb8", "outputs": { "almalinux_9": { @@ -222,8 +222,8 @@ "main_lb_name": "d4s-pre-cloud-l4-load-balancer", "octavia_flavor": "octavia_amphora-mvcpu-ha", "octavia_flavor_id": "394988b5-6603-4a1e-a939-8e177c6681c7", - "octavia_vrrp_ip_1": "10.1.34.232/32", - "octavia_vrrp_ip_2": "10.1.33.229/32", + "octavia_vrrp_ip_1": "10.1.33.159/32", + "octavia_vrrp_ip_2": "10.1.32.199/32", "swarm_lb_name": "d4s-pre-cloud-l4-swarm-load-balancer" }, "type": [ @@ -1333,12 +1333,12 @@ "admin_state_up": true, "allowed_cidrs": [], "connection_limit": -1, - "default_pool_id": "ea4e23f4-3655-43b2-acce-a5ef0919b4f8", + "default_pool_id": "b18171e2-e0cf-48cb-b4e7-5578b6d8b2d9", "default_tls_container_ref": "", "description": "HTTP listener of the main HAPROXY instances", - "id": "3901f110-7c96-4317-926b-37260ea4afa4", + "id": "c00564d5-180f-4bd9-9651-04d7b0c5639a", "insert_headers": {}, - "loadbalancer_id": "420fb3bd-a91e-41d2-8189-100a6272bf82", + "loadbalancer_id": "d873d56b-b81e-4f93-9959-4061ee5cdc92", "name": "main_haproxy_http_listener", "protocol": "TCP", "protocol_port": 80, @@ -1372,12 +1372,12 @@ "admin_state_up": true, "allowed_cidrs": [], "connection_limit": -1, - "default_pool_id": "f92a755d-257b-48e5-bb8c-b871ce88070a", + "default_pool_id": "6ad0a77e-2394-4393-bcd0-f68aea58bf98", "default_tls_container_ref": "", "description": "HTTPS listener of the main HAPROXY instances", - "id": "c4ea6eb4-5fb0-43ed-8e09-d06f22dd03be", + "id": "00e421dc-c475-4fb7-886e-a15ef75d000d", "insert_headers": {}, - "loadbalancer_id": "420fb3bd-a91e-41d2-8189-100a6272bf82", + "loadbalancer_id": "d873d56b-b81e-4f93-9959-4061ee5cdc92", "name": "main_haproxy_https_listener", "protocol": "TCP", "protocol_port": 443, @@ -1416,12 +1416,12 @@ "146.48.28.11/32" ], "connection_limit": -1, - "default_pool_id": "ab1a2ff1-638e-4308-bc01-5c673454aea2", + "default_pool_id": "14666020-ce29-4002-a6ca-a43e9a58a6ea", "default_tls_container_ref": "", "description": "Listener for the stats of the main HAPROXY instances", - "id": "3470d39d-bdac-4b58-8a83-c659b653235d", + "id": "bc6e2975-b28b-4b59-a7ee-6279332fe034", "insert_headers": {}, - "loadbalancer_id": "420fb3bd-a91e-41d2-8189-100a6272bf82", + "loadbalancer_id": "d873d56b-b81e-4f93-9959-4061ee5cdc92", "name": "main_haproxy_stats_listener", "protocol": "TCP", "protocol_port": 8880, @@ -1456,19 +1456,19 @@ "availability_zone": "", "description": "Main L4 load balancer for the D4Science PRE production", "flavor_id": "394988b5-6603-4a1e-a939-8e177c6681c7", - "id": "420fb3bd-a91e-41d2-8189-100a6272bf82", + "id": "d873d56b-b81e-4f93-9959-4061ee5cdc92", "loadbalancer_provider": "amphora", "name": "d4s-pre-cloud-l4-load-balancer", "region": "isti_area_pi_1", "security_group_ids": [ - "8e3b170f-9076-440d-bc99-874f4d8c5cbb" + "7deeb3a4-00d7-4da4-a44a-94e9c46bc048" ], "tags": [], "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null, "vip_address": "10.1.32.20", "vip_network_id": "23fd8a99-d551-4ada-8d3a-9859542ebb8c", - "vip_port_id": "2ed727c8-709a-48ed-9ef6-3357769f4f8e", + "vip_port_id": "87e495b7-cb73-435a-8145-cac2fd6e4d2f", "vip_subnet_id": "cd77a2fd-4a36-4254-b1d0-70b3874c6d04" }, "sensitive_attributes": [], @@ -1485,13 +1485,13 @@ { "schema_version": 0, "attributes": { - "id": "ea4e23f4-3655-43b2-acce-a5ef0919b4f8", + "id": "b18171e2-e0cf-48cb-b4e7-5578b6d8b2d9", "member": [ { "address": "10.1.32.11", "admin_state_up": true, "backup": false, - "id": "202c94c0-e071-4314-af8e-86a68ede56d4", + "id": "8b7749f8-e419-497a-aa94-a25986e548f0", "monitor_address": "", "monitor_port": 0, "name": "haproxy l7 1", @@ -1503,7 +1503,7 @@ "address": "10.1.32.12", "admin_state_up": true, "backup": false, - "id": "f5c7c9a1-ffa0-463b-8979-82f33898cf6a", + "id": "705fc958-c489-4020-943b-32f617a0bdb7", "monitor_address": "", "monitor_port": 0, "name": "haproxy l7 2", @@ -1512,7 +1512,7 @@ "weight": 1 } ], - "pool_id": "ea4e23f4-3655-43b2-acce-a5ef0919b4f8", + "pool_id": "b18171e2-e0cf-48cb-b4e7-5578b6d8b2d9", "region": "isti_area_pi_1", "timeouts": null }, @@ -1535,13 +1535,13 @@ { "schema_version": 0, "attributes": { - "id": "f92a755d-257b-48e5-bb8c-b871ce88070a", + "id": "6ad0a77e-2394-4393-bcd0-f68aea58bf98", "member": [ { "address": "10.1.32.11", "admin_state_up": true, "backup": false, - "id": "ffaa8e06-ae81-4539-a38a-d43e42c501dc", + "id": "0d9b1b36-9342-480c-b6e6-3bb88edc1423", "monitor_address": "", "monitor_port": 0, "name": "haproxy l7 1", @@ -1553,7 +1553,7 @@ "address": "10.1.32.12", "admin_state_up": true, "backup": false, - "id": "2966ef3c-c308-4671-8ea7-0d79d5405e4b", + "id": "d9136e80-d4f2-4a8a-a4b0-83d8c4d9fbd6", "monitor_address": "", "monitor_port": 0, "name": "haproxy l7 2", @@ -1562,7 +1562,7 @@ "weight": 1 } ], - "pool_id": "f92a755d-257b-48e5-bb8c-b871ce88070a", + "pool_id": "6ad0a77e-2394-4393-bcd0-f68aea58bf98", "region": "isti_area_pi_1", "timeouts": null }, @@ -1585,13 +1585,13 @@ { "schema_version": 0, "attributes": { - "id": "ab1a2ff1-638e-4308-bc01-5c673454aea2", + "id": "14666020-ce29-4002-a6ca-a43e9a58a6ea", "member": [ { "address": "10.1.32.11", "admin_state_up": true, "backup": false, - "id": "4b0f6c55-908b-49c4-b1ee-85d54aad08f5", + "id": "a2f32f94-1e93-4aea-aeff-75f3b6b939c0", "monitor_address": "", "monitor_port": 0, "name": "haproxy l7 1", @@ -1603,7 +1603,7 @@ "address": "10.1.32.12", "admin_state_up": true, "backup": false, - "id": "b1b1d56d-3876-42c9-bd6c-51aac81779cc", + "id": "e7430c15-5955-4341-b0ad-f6add9bf5d2f", "monitor_address": "", "monitor_port": 0, "name": "haproxy l7 2", @@ -1612,7 +1612,7 @@ "weight": 1 } ], - "pool_id": "ab1a2ff1-638e-4308-bc01-5c673454aea2", + "pool_id": "14666020-ce29-4002-a6ca-a43e9a58a6ea", "region": "isti_area_pi_1", "timeouts": null }, @@ -1639,11 +1639,11 @@ "delay": 20, "expected_codes": "200", "http_method": "GET", - "id": "00982aaf-c899-44a0-b605-aad45c69ac83", + "id": "f79f2910-90c7-4dfc-858c-b0fa71872553", "max_retries": 3, "max_retries_down": 3, "name": "main_haproxy_http_monitor", - "pool_id": "ea4e23f4-3655-43b2-acce-a5ef0919b4f8", + "pool_id": "b18171e2-e0cf-48cb-b4e7-5578b6d8b2d9", "region": "isti_area_pi_1", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeout": 5, @@ -1674,11 +1674,11 @@ "delay": 20, "expected_codes": "200", "http_method": "GET", - "id": "db5e5413-705f-47b0-808d-c65fe7ce1718", + "id": "2dfcc64d-ae6e-4d9b-9d85-29129f6131f6", "max_retries": 3, "max_retries_down": 3, "name": "main_haproxy_https_monitor", - "pool_id": "f92a755d-257b-48e5-bb8c-b871ce88070a", + "pool_id": "6ad0a77e-2394-4393-bcd0-f68aea58bf98", "region": "isti_area_pi_1", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeout": 5, @@ -1709,11 +1709,11 @@ "delay": 20, "expected_codes": "", "http_method": "", - "id": "28b45879-c2dc-4aac-8384-f45a8f2406dd", + "id": "10254ff6-a37c-4b53-9806-71b66249005e", "max_retries": 3, "max_retries_down": 3, "name": "main_haproxy_stats_monitor", - "pool_id": "ab1a2ff1-638e-4308-bc01-5c673454aea2", + "pool_id": "14666020-ce29-4002-a6ca-a43e9a58a6ea", "region": "isti_area_pi_1", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeout": 5, @@ -1742,9 +1742,9 @@ "attributes": { "admin_state_up": true, "description": "Pool for the HTTP listener of the main HAPROXY instances", - "id": "ea4e23f4-3655-43b2-acce-a5ef0919b4f8", + "id": "b18171e2-e0cf-48cb-b4e7-5578b6d8b2d9", "lb_method": "LEAST_CONNECTIONS", - "listener_id": "3901f110-7c96-4317-926b-37260ea4afa4", + "listener_id": "c00564d5-180f-4bd9-9651-04d7b0c5639a", "loadbalancer_id": null, "name": "main-haproxy-lb-http", "persistence": [ @@ -1778,9 +1778,9 @@ "attributes": { "admin_state_up": true, "description": "Pool for the HTTPS listener of the main HAPROXY instances", - "id": "f92a755d-257b-48e5-bb8c-b871ce88070a", + "id": "6ad0a77e-2394-4393-bcd0-f68aea58bf98", "lb_method": "LEAST_CONNECTIONS", - "listener_id": "c4ea6eb4-5fb0-43ed-8e09-d06f22dd03be", + "listener_id": "00e421dc-c475-4fb7-886e-a15ef75d000d", "loadbalancer_id": null, "name": "main-haproxy-lb-https", "persistence": [ @@ -1814,9 +1814,9 @@ "attributes": { "admin_state_up": true, "description": "Pool for the stats of the main HAPROXY instances", - "id": "ab1a2ff1-638e-4308-bc01-5c673454aea2", + "id": "14666020-ce29-4002-a6ca-a43e9a58a6ea", "lb_method": "LEAST_CONNECTIONS", - "listener_id": "3470d39d-bdac-4b58-8a83-c659b653235d", + "listener_id": "bc6e2975-b28b-4b59-a7ee-6279332fe034", "loadbalancer_id": null, "name": "main-haproxy-lb-stats", "persistence": [ @@ -1851,7 +1851,7 @@ "fixed_ip": "10.1.32.20", "floating_ip": "146.48.30.235", "id": "03f574a8-2868-4cbb-ab1f-0332ce2e89ee", - "port_id": "2ed727c8-709a-48ed-9ef6-3357769f4f8e", + "port_id": "87e495b7-cb73-435a-8145-cac2fd6e4d2f", "region": "isti_area_pi_1" }, "sensitive_attributes": [], @@ -1880,7 +1880,7 @@ "fixed_ip": "10.1.32.20", "id": "03f574a8-2868-4cbb-ab1f-0332ce2e89ee", "pool": "external-network", - "port_id": "2ed727c8-709a-48ed-9ef6-3357769f4f8e", + "port_id": "87e495b7-cb73-435a-8145-cac2fd6e4d2f", "region": "isti_area_pi_1", "subnet_id": null, "subnet_ids": null, @@ -2591,13 +2591,13 @@ "description": "Traffic from the first main lb instance to HAPROXY l7 1 port 443", "direction": "ingress", "ethertype": "IPv4", - "id": "496c0553-fd80-43be-8958-08c5c5333116", + "id": "99708119-4cee-4620-b12f-b30995d9e783", "port_range_max": 443, "port_range_min": 443, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "10.1.34.232/32", + "remote_ip_prefix": "10.1.33.159/32", "security_group_id": "194c32a1-5842-4be7-8c90-c03ebe4e25f0", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null @@ -2622,13 +2622,13 @@ "description": "Traffic from the first main lb instance to HAPROXY l7 1 port 80", "direction": "ingress", "ethertype": "IPv4", - "id": "e0474d9d-2842-49f3-ae34-281ce1f80e32", + "id": "99d35bec-5bb6-46cc-b22f-23adc2b30881", "port_range_max": 80, "port_range_min": 80, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "10.1.34.232/32", + "remote_ip_prefix": "10.1.33.159/32", "security_group_id": "194c32a1-5842-4be7-8c90-c03ebe4e25f0", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null @@ -2653,13 +2653,13 @@ "description": "Traffic from the first main lb instance to HAPROXY l7 1 port 8080", "direction": "ingress", "ethertype": "IPv4", - "id": "6c96d29f-05d7-4ac9-9a92-b58f492a9425", + "id": "01f95b00-e717-4cc0-9a5b-7b33ea6bfdbd", "port_range_max": 8080, "port_range_min": 8080, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "10.1.34.232/32", + "remote_ip_prefix": "10.1.33.159/32", "security_group_id": "194c32a1-5842-4be7-8c90-c03ebe4e25f0", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null @@ -2684,13 +2684,13 @@ "description": "Traffic from the first main lb instance to HAPROXY l7 2 port 443", "direction": "ingress", "ethertype": "IPv4", - "id": "3e08d7ac-098c-4f51-bbee-87f1ce9cf9b3", + "id": "a6fd91df-518a-4310-b2b8-122e6c4b214d", "port_range_max": 443, "port_range_min": 443, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "10.1.33.229/32", + "remote_ip_prefix": "10.1.32.199/32", "security_group_id": "194c32a1-5842-4be7-8c90-c03ebe4e25f0", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null @@ -2715,13 +2715,13 @@ "description": "Traffic from the first main lb instance to HAPROXY l7 2 port 80", "direction": "ingress", "ethertype": "IPv4", - "id": "c402f80c-734e-4394-80f0-817ea57af7b8", + "id": "51a2fbbe-c50f-4038-bc33-f363713a7ca6", "port_range_max": 80, "port_range_min": 80, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "10.1.33.229/32", + "remote_ip_prefix": "10.1.32.199/32", "security_group_id": "194c32a1-5842-4be7-8c90-c03ebe4e25f0", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null @@ -2746,13 +2746,13 @@ "description": "Traffic from the first main lb instance to HAPROXY l7 2 port 8080", "direction": "ingress", "ethertype": "IPv4", - "id": "2ddde65e-718c-44c5-829d-9318745bf8a3", + "id": "8ceeb127-36b1-41cc-b993-1e61a5568d06", "port_range_max": 8080, "port_range_min": 8080, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "10.1.33.229/32", + "remote_ip_prefix": "10.1.32.199/32", "security_group_id": "194c32a1-5842-4be7-8c90-c03ebe4e25f0", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null diff --git a/openstack-tf/d4s-preprod/variables/preprod.auto.tfvars b/openstack-tf/d4s-preprod/variables/preprod.auto.tfvars index 2ea5954d..6b83d234 100644 --- a/openstack-tf/d4s-preprod/variables/preprod.auto.tfvars +++ b/openstack-tf/d4s-preprod/variables/preprod.auto.tfvars @@ -15,8 +15,8 @@ octavia_information = { # The following aren't available when the module runs so we have to get them with the command # openstack --os-cloud d4s-pre port list -f value | grep octavia-lb-vrrp # This means that the execution will fail - octavia_vrrp_ip_1 = "10.1.34.232/32" - octavia_vrrp_ip_2 = "10.1.33.229/32" + octavia_vrrp_ip_1 = "10.1.33.159/32" + octavia_vrrp_ip_2 = "10.1.32.199/32" } os_project_data = { diff --git a/openstack-tf/d4s-preprod/variables/variables-preprod.tf b/openstack-tf/d4s-preprod/variables/variables-preprod.tf index 8323a486..2be61396 100644 --- a/openstack-tf/d4s-preprod/variables/variables-preprod.tf +++ b/openstack-tf/d4s-preprod/variables/variables-preprod.tf @@ -100,7 +100,7 @@ variable "octavia_information" { # The following aren't available when the module runs so we have to get them with the command # openstack --os-cloud d4s-pre port list -f value | grep octavia-lb-vrrp # This means that the execution will fail - octavia_vrrp_ip_1 = "10.1.34.232" - octavia_vrrp_ip_2 = "10.1.33.229" + octavia_vrrp_ip_1 = "10.1.33.159/32" + octavia_vrrp_ip_2 = "10.1.32.199/32" } }