From 703ef4da39f7988b67c97b1d117f7ef33e89b716 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 6 Jun 2024 18:10:59 +0200 Subject: [PATCH] Resize the postgresql instances. --- .../basic-infrastructure/terraform.tfstate | 12 +- .../accounting-dashboard-db/main.tf | 4 +- ...roduction-basic-infrastructure.auto.tfvars | 2 +- .../basic-infrastructure/provider.tf | 2 +- .../basic-infrastructure/terraform.tfstate | 350 +++--------------- .../garr-ct1/kubernetes-resources/main.tf | 28 ++ .../octavia-for-k8s.tf.sample | 319 ++++++++++++++++ .../outputs-kubernetes-resources.tf | 8 + .../garr-ct1/kubernetes-resources/provider.tf | 4 + .../kubernetes-resources/vm-resources.tf | 151 ++++++++ .../modules/common_variables/variables.tf | 2 +- .../dns_resources/terraform-provider.tf | 2 +- .../terraform-provider.tf | 2 +- openstack-tf/modules/ssh_keys/ssh-keys.tf | 2 +- 14 files changed, 567 insertions(+), 321 deletions(-) create mode 100644 openstack-tf/garr-ct1/kubernetes-resources/main.tf create mode 100644 openstack-tf/garr-ct1/kubernetes-resources/octavia-for-k8s.tf.sample create mode 100644 openstack-tf/garr-ct1/kubernetes-resources/outputs-kubernetes-resources.tf create mode 100644 openstack-tf/garr-ct1/kubernetes-resources/provider.tf create mode 100644 openstack-tf/garr-ct1/kubernetes-resources/vm-resources.tf diff --git a/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate b/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate index 023b9f1..b225943 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.7.5", - "serial": 265, + "serial": 267, "lineage": "6a53b692-c1a8-ed53-bc6c-b7fb5e017eb8", "outputs": { "almalinux_9": { @@ -344,7 +344,7 @@ "value": { "allocation_pool_end": "192.168.3.254", "allocation_pool_start": "192.168.0.100", - "flavor": "m1.medium", + "flavor": "m1.large", "name": "shared-postgresql-server", "network_cidr": "192.168.0.0/22", "network_description": "Network used to communicate with the shared postgresql service", @@ -1317,8 +1317,8 @@ ], "config_drive": null, "created": "2023-11-05 14:54:15 +0000 UTC", - "flavor_id": "4", - "flavor_name": "m1.medium", + "flavor_id": "9", + "flavor_name": "m1.large", "floating_ip": null, "force_delete": false, "id": "9ede65c7-70ca-4698-8551-754aa4f6fa1e", @@ -1361,8 +1361,8 @@ "stop_before_destroy": false, "tags": [], "timeouts": null, - "updated": "2023-11-05 14:54:48 +0000 UTC", - "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", + "updated": "2024-06-06 15:43:37 +0000 UTC", + "user_data": "", "vendor_options": [], "volume": [] }, diff --git a/openstack-tf/d4s-production/accounting-dashboard-db/main.tf b/openstack-tf/d4s-production/accounting-dashboard-db/main.tf index 866714f..125823f 100644 --- a/openstack-tf/d4s-production/accounting-dashboard-db/main.tf +++ b/openstack-tf/d4s-production/accounting-dashboard-db/main.tf @@ -4,7 +4,7 @@ terraform { required_providers { openstack = { source = "terraform-provider-openstack/openstack" - version = "~> 1.53.0" + version = ">= 1.54.0" } } } @@ -99,4 +99,4 @@ module "dns_records_create" { records = [local.cname_target] } } -} \ No newline at end of file +} diff --git a/openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars b/openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars index 754cb3f..a94f56c 100644 --- a/openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars +++ b/openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars @@ -2,7 +2,7 @@ default_security_group_name = "default_for_all" shared_postgresql_server_data = { name = "shared-postgresql-server" - flavor = "m1.large" + flavor = "m1.xxl" vol_data_name = "shared-postgresql-data" vol_data_size = "300" vol_data_device = "/dev/vdb" diff --git a/openstack-tf/d4s-production/basic-infrastructure/provider.tf b/openstack-tf/d4s-production/basic-infrastructure/provider.tf index f3a5a7b..1be9127 100644 --- a/openstack-tf/d4s-production/basic-infrastructure/provider.tf +++ b/openstack-tf/d4s-production/basic-infrastructure/provider.tf @@ -4,7 +4,7 @@ terraform { required_providers { openstack = { source = "terraform-provider-openstack/openstack" - version = "~> 1.53.0" + version = ">= 1.54.0" } } } diff --git a/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate b/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate index 79e49c8..66f21f7 100644 --- a/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate +++ b/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.7.5", - "serial": 583, + "serial": 585, "lineage": "954b57a1-c68e-fa2b-cf2f-79cc54aea13e", "outputs": { "almalinux_9": { @@ -342,7 +342,7 @@ "value": { "allocation_pool_end": "192.168.3.254", "allocation_pool_start": "192.168.0.100", - "flavor": "m1.large", + "flavor": "m1.xxl", "name": "shared-postgresql-server", "network_cidr": "192.168.0.0/22", "network_description": "Network used to communicate with the shared postgresql service", @@ -438,7 +438,6 @@ "created": "2023-11-06 18:33:59 +0000 UTC", "flavor_id": "9", "flavor_name": "m1.large", - "floating_ip": null, "force_delete": false, "id": "218369c6-7bd0-4b0c-aa71-dc07183007f3", "image_id": "Attempt to boot from volume - no image supplied", @@ -451,7 +450,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.31", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:bb:82:0b", "name": "d4s-production-cloud-main", "port": "", @@ -461,7 +459,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.147", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:75:ba:bb", "name": "swarm-nfs-net", "port": "", @@ -495,8 +492,7 @@ "timeouts": null, "updated": "2023-11-06 18:34:47 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.40.32", @@ -538,7 +534,6 @@ "created": "2023-11-06 18:32:37 +0000 UTC", "flavor_id": "9", "flavor_name": "m1.large", - "floating_ip": null, "force_delete": false, "id": "0c00cb58-71a3-4066-8570-0c6333022b4e", "image_id": "Attempt to boot from volume - no image supplied", @@ -551,7 +546,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.32", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:28:ab:a7", "name": "d4s-production-cloud-main", "port": "", @@ -561,7 +555,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.135", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:e5:20:36", "name": "swarm-nfs-net", "port": "", @@ -595,8 +588,7 @@ "timeouts": null, "updated": "2023-11-06 18:34:00 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.40.33", @@ -638,7 +630,6 @@ "created": "2023-11-06 18:32:37 +0000 UTC", "flavor_id": "9", "flavor_name": "m1.large", - "floating_ip": null, "force_delete": false, "id": "e27a68a2-f124-469f-8f9d-850bd93785e9", "image_id": "Attempt to boot from volume - no image supplied", @@ -651,7 +642,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.33", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:fd:7c:22", "name": "d4s-production-cloud-main", "port": "", @@ -661,7 +651,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.116", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:58:90:5b", "name": "swarm-nfs-net", "port": "", @@ -695,8 +684,7 @@ "timeouts": null, "updated": "2023-11-06 18:34:02 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] } ], "type": [ @@ -741,7 +729,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -760,7 +747,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -840,17 +826,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -893,7 +868,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -912,7 +886,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -992,17 +965,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -1045,7 +1007,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -1064,7 +1025,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -1144,17 +1104,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ] @@ -1687,7 +1636,6 @@ "created": "2023-11-06 18:56:49 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "60ece97f-cfea-4989-836c-0bb87d258e5a", "image_id": "Attempt to boot from volume - no image supplied", @@ -1700,7 +1648,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.182", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:cc:36:b0", "name": "d4s-production-cloud-main", "port": "", @@ -1710,7 +1657,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.109", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:dc:20:8b", "name": "swarm-nfs-net", "port": "", @@ -1744,8 +1690,7 @@ "timeouts": null, "updated": "2023-11-06 18:57:32 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.42.214", @@ -1787,7 +1732,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "3721fa5c-baf5-41c1-a00b-293cd6112e11", "image_id": "Attempt to boot from volume - no image supplied", @@ -1800,7 +1744,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.214", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:57:09:77", "name": "d4s-production-cloud-main", "port": "", @@ -1810,7 +1753,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.7", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:52:13:61", "name": "swarm-nfs-net", "port": "", @@ -1844,8 +1786,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:38 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.42.165", @@ -1887,7 +1828,6 @@ "created": "2023-11-06 18:56:48 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "f3cf42e3-b28b-4694-92e2-de9581eb1503", "image_id": "Attempt to boot from volume - no image supplied", @@ -1900,7 +1840,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.165", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:91:e6:2c", "name": "d4s-production-cloud-main", "port": "", @@ -1910,7 +1849,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.246", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:5f:ab:7c", "name": "swarm-nfs-net", "port": "", @@ -1944,8 +1882,7 @@ "timeouts": null, "updated": "2023-11-06 18:57:33 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.43.228", @@ -1987,7 +1924,6 @@ "created": "2023-11-06 18:49:12 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "14a705c3-844a-4c5f-b727-256b6f2f2039", "image_id": "Attempt to boot from volume - no image supplied", @@ -2000,7 +1936,6 @@ "access_network": false, "fixed_ip_v4": "10.1.43.228", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:44:04:b4", "name": "d4s-production-cloud-main", "port": "", @@ -2010,7 +1945,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.251", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:4f:c7:e9", "name": "swarm-nfs-net", "port": "", @@ -2044,8 +1978,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:34 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.45.77", @@ -2087,7 +2020,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "f39ad1ee-9f1e-43b7-b141-973d53e10a2e", "image_id": "Attempt to boot from volume - no image supplied", @@ -2100,7 +2032,6 @@ "access_network": false, "fixed_ip_v4": "10.1.45.77", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:b4:e0:29", "name": "d4s-production-cloud-main", "port": "", @@ -2110,7 +2041,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.181", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:77:3e:38", "name": "swarm-nfs-net", "port": "", @@ -2144,8 +2074,7 @@ "timeouts": null, "updated": "2024-01-12 11:18:04 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.44.73", @@ -2187,7 +2116,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "58360f23-4703-47f0-8b27-d621463c245c", "image_id": "Attempt to boot from volume - no image supplied", @@ -2200,7 +2128,6 @@ "access_network": false, "fixed_ip_v4": "10.1.44.73", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:db:85:25", "name": "d4s-production-cloud-main", "port": "", @@ -2210,7 +2137,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.12", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:b9:b1:ef", "name": "swarm-nfs-net", "port": "", @@ -2244,8 +2170,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:45 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.45.59", @@ -2287,7 +2212,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "dca55156-78be-4392-a9b1-3a93dee81dd0", "image_id": "Attempt to boot from volume - no image supplied", @@ -2300,7 +2224,6 @@ "access_network": false, "fixed_ip_v4": "10.1.45.59", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:67:11:2e", "name": "d4s-production-cloud-main", "port": "", @@ -2310,7 +2233,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.113", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:4a:d0:69", "name": "swarm-nfs-net", "port": "", @@ -2344,8 +2266,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:39 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, { "access_ip_v4": "10.1.42.92", @@ -2387,7 +2308,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "62a0cd55-f4b9-4bf0-bc8b-2da1e43bca0c", "image_id": "Attempt to boot from volume - no image supplied", @@ -2400,7 +2320,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.92", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:aa:24:4c", "name": "d4s-production-cloud-main", "port": "", @@ -2410,7 +2329,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.54", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:e2:8a:b5", "name": "swarm-nfs-net", "port": "", @@ -2444,8 +2362,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:37 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] } ], "type": [ @@ -2490,7 +2407,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -2509,7 +2425,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -2589,17 +2504,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -2642,7 +2546,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -2661,7 +2564,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -2741,17 +2643,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -2794,7 +2685,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -2813,7 +2703,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -2893,17 +2782,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -2946,7 +2824,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -2965,7 +2842,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -3045,17 +2921,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -3098,7 +2963,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -3117,7 +2981,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -3197,17 +3060,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -3250,7 +3102,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -3269,7 +3120,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -3349,17 +3199,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -3402,7 +3241,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -3421,7 +3259,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -3501,17 +3338,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ], @@ -3554,7 +3380,6 @@ "created": "string", "flavor_id": "string", "flavor_name": "string", - "floating_ip": "string", "force_delete": "bool", "id": "string", "image_id": "string", @@ -3573,7 +3398,6 @@ "access_network": "bool", "fixed_ip_v4": "string", "fixed_ip_v6": "string", - "floating_ip": "string", "mac": "string", "name": "string", "port": "string", @@ -3653,17 +3477,6 @@ "ignore_resize_confirmation": "bool" } ] - ], - "volume": [ - "set", - [ - "object", - { - "device": "string", - "id": "string", - "volume_id": "string" - } - ] ] } ] @@ -5382,13 +5195,13 @@ } ], "availability_zone": "nova", + "backup_id": "", "consistency_group_id": null, "description": "", "enable_online_resize": null, "id": "1a1b2857-0031-447b-9d63-2588bec45628", "image_id": null, "metadata": {}, - "multiattach": null, "name": "prometheus-data", "region": "isti_area_pi_1", "scheduler_hints": [], @@ -5421,13 +5234,13 @@ } ], "availability_zone": "nova", + "backup_id": "", "consistency_group_id": null, "description": "", "enable_online_resize": null, "id": "ccccc2e7-693a-49fa-8d70-ad341529469d", "image_id": null, "metadata": {}, - "multiattach": null, "name": "shared-postgresql-backup-data", "region": "isti_area_pi_1", "scheduler_hints": [], @@ -5460,13 +5273,13 @@ } ], "availability_zone": "nova", + "backup_id": "", "consistency_group_id": null, "description": "", "enable_online_resize": null, "id": "1f6bf923-80e5-4038-ae08-79586f0e099a", "image_id": null, "metadata": {}, - "multiattach": null, "name": "shared-postgresql-data", "region": "isti_area_pi_1", "scheduler_hints": [], @@ -5499,13 +5312,13 @@ } ], "availability_zone": "nova", + "backup_id": "", "consistency_group_id": null, "description": "", "enable_online_resize": null, "id": "37a62707-52f1-4135-a35d-4dd248eee2af", "image_id": null, "metadata": {}, - "multiattach": null, "name": "Swarm NFS server data Disk", "region": "isti_area_pi_1", "scheduler_hints": [], @@ -5625,7 +5438,6 @@ "created": "2023-11-06 18:33:59 +0000 UTC", "flavor_id": "9", "flavor_name": "m1.large", - "floating_ip": null, "force_delete": false, "id": "218369c6-7bd0-4b0c-aa71-dc07183007f3", "image_id": "Attempt to boot from volume - no image supplied", @@ -5638,7 +5450,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.31", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:bb:82:0b", "name": "d4s-production-cloud-main", "port": "", @@ -5648,7 +5459,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.147", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:75:ba:bb", "name": "swarm-nfs-net", "port": "", @@ -5682,8 +5492,7 @@ "timeouts": null, "updated": "2023-11-06 18:34:47 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -5738,7 +5547,6 @@ "created": "2023-11-06 18:32:37 +0000 UTC", "flavor_id": "9", "flavor_name": "m1.large", - "floating_ip": null, "force_delete": false, "id": "0c00cb58-71a3-4066-8570-0c6333022b4e", "image_id": "Attempt to boot from volume - no image supplied", @@ -5751,7 +5559,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.32", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:28:ab:a7", "name": "d4s-production-cloud-main", "port": "", @@ -5761,7 +5568,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.135", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:e5:20:36", "name": "swarm-nfs-net", "port": "", @@ -5795,8 +5601,7 @@ "timeouts": null, "updated": "2023-11-06 18:34:00 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -5851,7 +5656,6 @@ "created": "2023-11-06 18:32:37 +0000 UTC", "flavor_id": "9", "flavor_name": "m1.large", - "floating_ip": null, "force_delete": false, "id": "e27a68a2-f124-469f-8f9d-850bd93785e9", "image_id": "Attempt to boot from volume - no image supplied", @@ -5864,7 +5668,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.33", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:fd:7c:22", "name": "d4s-production-cloud-main", "port": "", @@ -5874,7 +5677,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.116", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:58:90:5b", "name": "swarm-nfs-net", "port": "", @@ -5908,8 +5710,7 @@ "timeouts": null, "updated": "2023-11-06 18:34:02 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -5972,7 +5773,6 @@ "created": "2023-11-06 18:56:49 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "60ece97f-cfea-4989-836c-0bb87d258e5a", "image_id": "Attempt to boot from volume - no image supplied", @@ -5985,7 +5785,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.182", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:cc:36:b0", "name": "d4s-production-cloud-main", "port": "", @@ -5995,7 +5794,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.109", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:dc:20:8b", "name": "swarm-nfs-net", "port": "", @@ -6029,8 +5827,7 @@ "timeouts": null, "updated": "2023-11-06 18:57:32 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6084,7 +5881,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "3721fa5c-baf5-41c1-a00b-293cd6112e11", "image_id": "Attempt to boot from volume - no image supplied", @@ -6097,7 +5893,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.214", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:57:09:77", "name": "d4s-production-cloud-main", "port": "", @@ -6107,7 +5902,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.7", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:52:13:61", "name": "swarm-nfs-net", "port": "", @@ -6141,8 +5935,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:38 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6196,7 +5989,6 @@ "created": "2023-11-06 18:56:48 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "f3cf42e3-b28b-4694-92e2-de9581eb1503", "image_id": "Attempt to boot from volume - no image supplied", @@ -6209,7 +6001,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.165", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:91:e6:2c", "name": "d4s-production-cloud-main", "port": "", @@ -6219,7 +6010,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.246", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:5f:ab:7c", "name": "swarm-nfs-net", "port": "", @@ -6253,8 +6043,7 @@ "timeouts": null, "updated": "2023-11-06 18:57:33 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6308,7 +6097,6 @@ "created": "2023-11-06 18:49:12 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "14a705c3-844a-4c5f-b727-256b6f2f2039", "image_id": "Attempt to boot from volume - no image supplied", @@ -6321,7 +6109,6 @@ "access_network": false, "fixed_ip_v4": "10.1.43.228", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:44:04:b4", "name": "d4s-production-cloud-main", "port": "", @@ -6331,7 +6118,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.251", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:4f:c7:e9", "name": "swarm-nfs-net", "port": "", @@ -6365,8 +6151,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:34 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6420,7 +6205,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "f39ad1ee-9f1e-43b7-b141-973d53e10a2e", "image_id": "Attempt to boot from volume - no image supplied", @@ -6433,7 +6217,6 @@ "access_network": false, "fixed_ip_v4": "10.1.45.77", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:b4:e0:29", "name": "d4s-production-cloud-main", "port": "", @@ -6443,7 +6226,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.181", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:77:3e:38", "name": "swarm-nfs-net", "port": "", @@ -6477,8 +6259,7 @@ "timeouts": null, "updated": "2024-01-12 11:18:04 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6532,7 +6313,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "58360f23-4703-47f0-8b27-d621463c245c", "image_id": "Attempt to boot from volume - no image supplied", @@ -6545,7 +6325,6 @@ "access_network": false, "fixed_ip_v4": "10.1.44.73", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:db:85:25", "name": "d4s-production-cloud-main", "port": "", @@ -6555,7 +6334,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.12", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:b9:b1:ef", "name": "swarm-nfs-net", "port": "", @@ -6589,8 +6367,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:45 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6644,7 +6421,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "dca55156-78be-4392-a9b1-3a93dee81dd0", "image_id": "Attempt to boot from volume - no image supplied", @@ -6657,7 +6433,6 @@ "access_network": false, "fixed_ip_v4": "10.1.45.59", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:67:11:2e", "name": "d4s-production-cloud-main", "port": "", @@ -6667,7 +6442,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.113", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:4a:d0:69", "name": "swarm-nfs-net", "port": "", @@ -6701,8 +6475,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:39 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6756,7 +6529,6 @@ "created": "2023-11-06 18:49:11 +0000 UTC", "flavor_id": "18", "flavor_name": "m1.xxl", - "floating_ip": null, "force_delete": false, "id": "62a0cd55-f4b9-4bf0-bc8b-2da1e43bca0c", "image_id": "Attempt to boot from volume - no image supplied", @@ -6769,7 +6541,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.92", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:aa:24:4c", "name": "d4s-production-cloud-main", "port": "", @@ -6779,7 +6550,6 @@ "access_network": false, "fixed_ip_v4": "192.168.5.54", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:e2:8a:b5", "name": "swarm-nfs-net", "port": "", @@ -6813,8 +6583,7 @@ "timeouts": null, "updated": "2023-11-06 18:50:37 +0000 UTC", "user_data": "", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -6862,7 +6631,6 @@ "created": "2023-11-06 09:41:35 +0000 UTC", "flavor_id": "2", "flavor_name": "m1.small", - "floating_ip": null, "force_delete": false, "id": "f73dbfbf-4971-4bbb-8f89-4beba4be4e61", "image_id": "Attempt to boot from volume - no image supplied", @@ -6875,7 +6643,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.4", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:c1:8b:4f", "name": "d4s-production-cloud-main", "port": "", @@ -6895,8 +6662,7 @@ "timeouts": null, "updated": "2023-11-06 22:44:11 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19" @@ -6939,7 +6705,6 @@ "created": "2023-11-06 14:02:36 +0000 UTC", "flavor_id": "4", "flavor_name": "m1.medium", - "floating_ip": null, "force_delete": false, "id": "5123837f-cbaf-4574-872f-20ea7fe01490", "image_id": "Attempt to boot from volume - no image supplied", @@ -6952,7 +6717,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.11", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:57:7e:40", "name": "d4s-production-cloud-main", "port": "", @@ -6984,8 +6748,7 @@ "timeouts": null, "updated": "2023-11-06 14:03:14 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -7024,7 +6787,6 @@ "created": "2023-11-06 14:02:35 +0000 UTC", "flavor_id": "4", "flavor_name": "m1.medium", - "floating_ip": null, "force_delete": false, "id": "1f2a14f4-d3f7-40c2-b911-24c30fe7da6f", "image_id": "Attempt to boot from volume - no image supplied", @@ -7037,7 +6799,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.12", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:aa:96:12", "name": "d4s-production-cloud-main", "port": "", @@ -7069,8 +6830,7 @@ "timeouts": null, "updated": "2023-11-06 14:03:16 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -7116,7 +6876,6 @@ "created": "2023-11-06 09:43:33 +0000 UTC", "flavor_id": "4", "flavor_name": "m1.medium", - "floating_ip": null, "force_delete": false, "id": "257718b8-4ac0-4b5c-b1d1-a3f758c20b52", "image_id": "Attempt to boot from volume - no image supplied", @@ -7129,7 +6888,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.10", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:2c:2d:aa", "name": "d4s-production-cloud-main", "port": "", @@ -7151,8 +6909,7 @@ "timeouts": null, "updated": "2023-11-06 09:44:02 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -7196,9 +6953,8 @@ ], "config_drive": null, "created": "2023-11-06 12:04:21 +0000 UTC", - "flavor_id": "9", - "flavor_name": "m1.large", - "floating_ip": null, + "flavor_id": "18", + "flavor_name": "m1.xxl", "force_delete": false, "id": "5f70ba3a-7e5e-4dd5-b1a5-837b5e152c2c", "image_id": "Attempt to boot from volume - no image supplied", @@ -7211,7 +6967,6 @@ "access_network": false, "fixed_ip_v4": "10.1.43.162", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:22:58:1f", "name": "d4s-production-cloud-main", "port": "", @@ -7221,7 +6976,6 @@ "access_network": false, "fixed_ip_v4": "192.168.0.5", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:2d:75:ac", "name": "postgresql-srv-net", "port": "", @@ -7240,10 +6994,9 @@ "stop_before_destroy": false, "tags": [], "timeouts": null, - "updated": "2023-11-06 12:04:53 +0000 UTC", - "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", - "vendor_options": [], - "volume": [] + "updated": "2024-06-06 16:01:23 +0000 UTC", + "user_data": "", + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -7288,7 +7041,6 @@ "created": "2023-11-06 09:41:35 +0000 UTC", "flavor_id": "10", "flavor_name": "m2.small", - "floating_ip": null, "force_delete": false, "id": "837b6e43-31f0-4ca3-bc6f-07181e9cd6c4", "image_id": "Attempt to boot from volume - no image supplied", @@ -7301,7 +7053,6 @@ "access_network": false, "fixed_ip_v4": "10.1.40.5", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:26:3a:c5", "name": "d4s-production-cloud-main", "port": "", @@ -7322,8 +7073,7 @@ "timeouts": null, "updated": "2023-11-06 23:00:54 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -7368,7 +7118,6 @@ "created": "2023-11-06 18:56:48 +0000 UTC", "flavor_id": "4", "flavor_name": "m1.medium", - "floating_ip": null, "force_delete": false, "id": "89f336c3-5d22-459b-9d73-18da4eab8db1", "image_id": "Attempt to boot from volume - no image supplied", @@ -7381,7 +7130,6 @@ "access_network": false, "fixed_ip_v4": "10.1.42.2", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:00:3c:a6", "name": "d4s-production-cloud-main", "port": "", @@ -7391,7 +7139,6 @@ "access_network": false, "fixed_ip_v4": "192.168.4.10", "fixed_ip_v6": "", - "floating_ip": "", "mac": "fa:16:3e:74:1d:bb", "name": "swarm-nfs-net", "port": "", @@ -7412,8 +7159,7 @@ "timeouts": null, "updated": "2023-11-06 18:57:29 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", - "vendor_options": [], - "volume": [] + "vendor_options": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", @@ -7823,6 +7569,7 @@ "instance_id": "257718b8-4ac0-4b5c-b1d1-a3f758c20b52", "multiattach": null, "region": "isti_area_pi_1", + "tag": null, "timeouts": null, "vendor_options": [], "volume_id": "1a1b2857-0031-447b-9d63-2588bec45628" @@ -7852,6 +7599,7 @@ "instance_id": "5f70ba3a-7e5e-4dd5-b1a5-837b5e152c2c", "multiattach": null, "region": "isti_area_pi_1", + "tag": null, "timeouts": null, "vendor_options": [], "volume_id": "ccccc2e7-693a-49fa-8d70-ad341529469d" @@ -7880,6 +7628,7 @@ "instance_id": "5f70ba3a-7e5e-4dd5-b1a5-837b5e152c2c", "multiattach": null, "region": "isti_area_pi_1", + "tag": null, "timeouts": null, "vendor_options": [], "volume_id": "1f6bf923-80e5-4038-ae08-79586f0e099a" @@ -7908,6 +7657,7 @@ "instance_id": "89f336c3-5d22-459b-9d73-18da4eab8db1", "multiattach": null, "region": "isti_area_pi_1", + "tag": null, "timeouts": null, "vendor_options": [], "volume_id": "37a62707-52f1-4135-a35d-4dd248eee2af" @@ -12169,12 +11919,6 @@ "start": "192.168.0.100" } ], - "allocation_pools": [ - { - "end": "192.168.3.254", - "start": "192.168.0.100" - } - ], "cidr": "192.168.0.0/22", "description": "subnet used to connect to the shared PostgreSQL service", "dns_nameservers": [ @@ -12184,7 +11928,6 @@ ], "enable_dhcp": true, "gateway_ip": "", - "host_routes": [], "id": "761c3c40-5963-40df-a677-cd9b51b72b4d", "ip_version": 4, "ipv6_address_mode": "", @@ -12225,12 +11968,6 @@ "start": "192.168.4.100" } ], - "allocation_pools": [ - { - "end": "192.168.5.254", - "start": "192.168.4.100" - } - ], "cidr": "192.168.4.0/23", "description": "Subnet used by the Swarm cluster and the NFS service", "dns_nameservers": [ @@ -12240,7 +11977,6 @@ ], "enable_dhcp": true, "gateway_ip": "", - "host_routes": [], "id": "44326d4d-6179-471a-8041-63a75211b6ce", "ip_version": 4, "ipv6_address_mode": "", diff --git a/openstack-tf/garr-ct1/kubernetes-resources/main.tf b/openstack-tf/garr-ct1/kubernetes-resources/main.tf new file mode 100644 index 0000000..575c06b --- /dev/null +++ b/openstack-tf/garr-ct1/kubernetes-resources/main.tf @@ -0,0 +1,28 @@ +# Define required providers +terraform { + required_version = ">= 0.16.0" + required_providers { + openstack = { + source = "terraform-provider-openstack/openstack" + version = ">= 1.53.0" + } + } +} + +data "terraform_remote_state" "privnet_dns_router" { + backend = "local" + + config = { + path = "../project-setup/terraform.tfstate" + } +} + +# SSH settings +module "ssh_settings" { + source = "../../modules/ssh-key-ref" +} + +# Global variables (constants, really) +module "common_variables" { + source = "../../modules/garr_common_variables" +} diff --git a/openstack-tf/garr-ct1/kubernetes-resources/octavia-for-k8s.tf.sample b/openstack-tf/garr-ct1/kubernetes-resources/octavia-for-k8s.tf.sample new file mode 100644 index 0000000..5fac466 --- /dev/null +++ b/openstack-tf/garr-ct1/kubernetes-resources/octavia-for-k8s.tf.sample @@ -0,0 +1,319 @@ +# +# Octavia +# +# Swarm load balancer. L4, backed by Octavia +resource "openstack_lb_loadbalancer_v2" "swarm_lb" { + vip_subnet_id = var.main_private_subnet_id + name = var.octavia_swarm_data.swarm_lb_name + description = var.octavia_swarm_data.swarm_lb_description + flavor_id = var.octavia_swarm_data.octavia_flavor_id + vip_address = var.octavia_swarm_data.swarm_octavia_main_ip + # availability_zone = var.availability_zones_names.availability_zone_no_gpu + loadbalancer_provider = "amphora" +} + +# Allocate a floating IP +resource "openstack_networking_floatingip_v2" "swarm_lb_ip" { + pool = var.floating_ip_pools.main_public_ip_pool + # The DNS association does not work because of a bug in the OpenStack API + # dns_name = "main-lb" + # dns_domain = var.dns_zone.zone_name + description = var.octavia_swarm_data.swarm_lb_description +} + +resource "openstack_networking_floatingip_associate_v2" "swarm_lb" { + floating_ip = openstack_networking_floatingip_v2.swarm_lb_ip.address + port_id = openstack_lb_loadbalancer_v2.swarm_lb.vip_port_id +} + +locals { + swarm_recordset_name = "${var.octavia_swarm_data.swarm_lb_hostname}.${var.dns_zone.zone_name}" + portainer_recordset_name = "portainer.${var.dns_zone.zone_name}" + ccp_recordset_name = "ccp.${var.dns_zone.zone_name}" + cdn_recordset_name = "cdn.${var.dns_zone.zone_name}" + conductor_recordset_name = "conductor.${var.dns_zone.zone_name}" +} + +resource "openstack_dns_recordset_v2" "swarm_lb_dns_recordset" { + zone_id = var.dns_zone_id + name = local.swarm_recordset_name + description = "Public IP address of the load balancer in front of Docker Swarm" + ttl = 8600 + type = "A" + records = [openstack_networking_floatingip_v2.swarm_lb_ip.address] +} + +resource "openstack_dns_recordset_v2" "swarm_portainer_dns_recordset" { + zone_id = var.dns_zone_id + name = local.portainer_recordset_name + description = "Portainer hostname" + ttl = 8600 + type = "CNAME" + records = [local.swarm_recordset_name] +} + +resource "openstack_dns_recordset_v2" "ccp_dns_recordset" { + zone_id = var.dns_zone_id + name = local.ccp_recordset_name + description = "CCP hostname" + ttl = 8600 + type = "CNAME" + records = [local.swarm_recordset_name] +} + +resource "openstack_dns_recordset_v2" "cdn_dns_recordset" { + zone_id = var.dns_zone_id + name = local.cdn_recordset_name + description = "CDN hostname" + ttl = 8600 + type = "CNAME" + records = [local.swarm_recordset_name] +} + +resource "openstack_dns_recordset_v2" "conductor_dns_recordset" { + zone_id = var.dns_zone_id + name = local.conductor_recordset_name + description = "Conductor hostname" + ttl = 8600 + type = "CNAME" + records = [local.swarm_recordset_name] +} + +# Main HAPROXY stats listener +resource "openstack_lb_listener_v2" "swarm_haproxy_stats_listener" { + loadbalancer_id = openstack_lb_loadbalancer_v2.swarm_lb.id + protocol = "TCP" + protocol_port = 8880 + description = "Listener for the stats of the Docker Swarm HAPROXY instances" + name = "swarm_haproxy_stats_listener" + allowed_cidrs = [var.ssh_sources.d4s_vpn_1_cidr, var.ssh_sources.d4s_vpn_2_cidr, var.ssh_sources.s2i2s_vpn_1_cidr, var.ssh_sources.s2i2s_vpn_2_cidr] + +} + +resource "openstack_lb_pool_v2" "swarm_haproxy_stats_pool" { + listener_id = openstack_lb_listener_v2.swarm_haproxy_stats_listener.id + protocol = "TCP" + lb_method = "LEAST_CONNECTIONS" + name = "swarm-haproxy-lb-stats" + description = "Pool for the stats of the main HAPROXY instances" + persistence { + type = "SOURCE_IP" + } +} + +resource "openstack_lb_members_v2" "swarm_haproxy_stats_pool_members" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_stats_pool.id + member { + name = "swarm mgr haproxy 1" + address = var.docker_swarm_data.mgr1_ip + protocol_port = 8880 + } + member { + name = "swarm mgr haproxy 2" + address = var.docker_swarm_data.mgr2_ip + protocol_port = 8880 + } + member { + name = "swarm mgr haproxy 3" + address = var.docker_swarm_data.mgr3_ip + protocol_port = 8880 + } +} + +resource "openstack_lb_monitor_v2" "swarm_haproxy_stats_monitor" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_stats_pool.id + name = "swarm_haproxy_stats_monitor" + type = "TCP" + delay = 20 + timeout = 5 + max_retries = 3 + admin_state_up = true +} + +# HAPROXY HTTP +resource "openstack_lb_listener_v2" "swarm_haproxy_http_listener" { + loadbalancer_id = openstack_lb_loadbalancer_v2.swarm_lb.id + protocol = "TCP" + protocol_port = 80 + description = "HTTP listener of the Docker Swarm HAPROXY instances" + name = "swarm_haproxy_http_listener" + admin_state_up = true +} + +resource "openstack_lb_pool_v2" "swarm_haproxy_http_pool" { + listener_id = openstack_lb_listener_v2.swarm_haproxy_http_listener.id + protocol = "PROXYV2" + lb_method = "LEAST_CONNECTIONS" + name = "swarm-haproxy-lb-http" + description = "Pool for the HTTP listener of the Docker Swarm HAPROXY instances" + persistence { + type = "SOURCE_IP" + } + admin_state_up = true +} + +resource "openstack_lb_members_v2" "swarm_haproxy_http_pool_members" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_http_pool.id + member { + name = "swarm mgr haproxy 1" + address = var.docker_swarm_data.mgr1_ip + protocol_port = 80 + } + member { + name = "swarm mgr haproxy 2" + address = var.docker_swarm_data.mgr2_ip + protocol_port = 80 + } + member { + name = "swarm mgr haproxy 3" + address = var.docker_swarm_data.mgr3_ip + protocol_port = 80 + } +} + +resource "openstack_lb_monitor_v2" "swarm_haproxy_http_monitor" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_http_pool.id + name = "swarm_haproxy_http_monitor" + type = "HTTP" + http_method = "GET" + url_path = "/_haproxy_health_check" + expected_codes = "200" + delay = 20 + timeout = 5 + max_retries = 3 + admin_state_up = true +} + +# HAPROXY HTTPS +resource "openstack_lb_listener_v2" "swarm_haproxy_https_listener" { + loadbalancer_id = openstack_lb_loadbalancer_v2.swarm_lb.id + protocol = "TCP" + protocol_port = 443 + description = "HTTPS listener of the main HAPROXY instances" + name = "swarm_haproxy_https_listener" + admin_state_up = true +} + +resource "openstack_lb_pool_v2" "swarm_haproxy_https_pool" { + listener_id = openstack_lb_listener_v2.swarm_haproxy_https_listener.id + protocol = "PROXYV2" + lb_method = "LEAST_CONNECTIONS" + name = "swarm-haproxy-lb-https" + description = "Pool for the HTTPS listener of the Docker Swarm HAPROXY instances" + persistence { + type = "SOURCE_IP" + } + admin_state_up = true +} + +resource "openstack_lb_members_v2" "swarm_haproxy_https_pool_members" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_https_pool.id + member { + name = "swarm mgr haproxy 1" + address = var.docker_swarm_data.mgr1_ip + protocol_port = 443 + } + member { + name = "swarm mgr haproxy 2" + address = var.docker_swarm_data.mgr2_ip + protocol_port = 443 + } + member { + name = "swarm mgr haproxy 3" + address = var.docker_swarm_data.mgr3_ip + protocol_port = 443 + } +} + +resource "openstack_lb_monitor_v2" "swarm_haproxy_https_monitor" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_https_pool.id + name = "swarm_haproxy_https_monitor" + type = "HTTPS" + http_method = "GET" + url_path = "/_haproxy_health_check" + expected_codes = "200" + delay = 20 + timeout = 5 + max_retries = 3 + admin_state_up = true +} + +# HAPROXY HTTP on port 8080 +resource "openstack_lb_listener_v2" "swarm_haproxy_8080_listener" { + loadbalancer_id = openstack_lb_loadbalancer_v2.swarm_lb.id + protocol = "TCP" + protocol_port = 8080 + description = "HTTP port 8080 listener of the Docker Swarm HAPROXY instances" + name = "swarm_haproxy_8080_listener" + admin_state_up = true +} + +resource "openstack_lb_pool_v2" "swarm_haproxy_8080_pool" { + listener_id = openstack_lb_listener_v2.swarm_haproxy_8080_listener.id + protocol = "PROXYV2" + lb_method = "LEAST_CONNECTIONS" + name = "swarm-haproxy-lb-http-8080" + description = "Pool for the HTTP port 8080 listener of the Docker Swarm HAPROXY instances" + persistence { + type = "SOURCE_IP" + } + admin_state_up = true +} + +resource "openstack_lb_members_v2" "swarm_haproxy_8080_pool_members" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_8080_pool.id + member { + name = "swarm mgr haproxy 1" + address = var.docker_swarm_data.mgr1_ip + protocol_port = 8080 + } + member { + name = "swarm mgr haproxy 2" + address = var.docker_swarm_data.mgr2_ip + protocol_port = 8080 + } + member { + name = "swarm mgr haproxy 3" + address = var.docker_swarm_data.mgr3_ip + protocol_port = 8080 + } +} + +resource "openstack_lb_monitor_v2" "swarm_haproxy_8080_monitor" { + pool_id = openstack_lb_pool_v2.swarm_haproxy_8080_pool.id + name = "swarm_haproxy_8080_monitor" + type = "HTTP" + http_method = "GET" + url_path = "/_haproxy_health_check" + expected_codes = "200" + delay = 20 + timeout = 5 + max_retries = 3 + admin_state_up = true +} + +output "swarm_loadbalancer_ip" { + description = "Docker Swarm Load balancer IP address" + value = openstack_lb_loadbalancer_v2.swarm_lb.vip_address +} + +output "swarm_manager_nodes" { + description = "Docker Swarm Manager nodes data" + value = openstack_compute_instance_v2.docker_swarm_managers + sensitive = true +} + +output "swarm_worker_nodes" { + description = "Docker Swarm Worker nodes data" + value = openstack_compute_instance_v2.docker_swarm_workers + sensitive = true +} + +output "swarm_managers_nfs_ip_ports" { + description = "IP addresses in the share NFS network" + value = openstack_networking_port_v2.swarm_mgr_nfs_port +} +output "swarm_workers_nfs_ip_ports" { + description = "IP addresses in the share NFS network" + value = openstack_networking_port_v2.swarm_workers_nfs_port +} diff --git a/openstack-tf/garr-ct1/kubernetes-resources/outputs-kubernetes-resources.tf b/openstack-tf/garr-ct1/kubernetes-resources/outputs-kubernetes-resources.tf new file mode 100644 index 0000000..dd44873 --- /dev/null +++ b/openstack-tf/garr-ct1/kubernetes-resources/outputs-kubernetes-resources.tf @@ -0,0 +1,8 @@ +output "scilake_instance" { + value = openstack_compute_instance_v2.scilake_intelcomp_server + sensitive = true +} + +output "scilake_floating_ip" { + value = openstack_networking_floatingip_v2.scilake_catalogue_server_ip +} diff --git a/openstack-tf/garr-ct1/kubernetes-resources/provider.tf b/openstack-tf/garr-ct1/kubernetes-resources/provider.tf new file mode 100644 index 0000000..e916fc5 --- /dev/null +++ b/openstack-tf/garr-ct1/kubernetes-resources/provider.tf @@ -0,0 +1,4 @@ +provider "openstack" { + cloud = "garr-ct1" +} + diff --git a/openstack-tf/garr-ct1/kubernetes-resources/vm-resources.tf b/openstack-tf/garr-ct1/kubernetes-resources/vm-resources.tf new file mode 100644 index 0000000..17107d9 --- /dev/null +++ b/openstack-tf/garr-ct1/kubernetes-resources/vm-resources.tf @@ -0,0 +1,151 @@ +# +# Server groups for both the controllers and the workers +# +resource "openstack_compute_servergroup_v2" "k8s_controllers" { + name = "k8s_controllers" + policies = ["soft-anti-affinity"] +} +resource "openstack_compute_servergroup_v2" "k8s_workers" { + name = "k8s_workers" + policies = ["soft-anti-affinity"] +} + +# +# Allow traffic between the cluster nodes +# +resource "openstack_networking_secgroup_v2" "k8s_internal_traffic" { + name = "k8s_internal_traffic" + delete_default_rules = "true" + description = "Traffic between the Docker k8s nodes" +} +resource "openstack_networking_secgroup_rule_v2" "everything_udp" { + security_group_id = openstack_networking_secgroup_v2.k8s_internal_traffic.id + description = "UDP traffic between k8s nodes" + direction = "ingress" + ethertype = "IPv4" + protocol = "udp" + remote_ip_prefix = data.terraform_remote_state.privnet_dns_router.outputs.main_private_subnet.cidr +} +resource "openstack_networking_secgroup_rule_v2" "everything_tcp" { + security_group_id = openstack_networking_secgroup_v2.k8s_internal_traffic.id + description = "TCP traffic between k8s nodes" + direction = "ingress" + ethertype = "IPv4" + protocol = "tcp" + remote_ip_prefix = data.terraform_remote_state.privnet_dns_router.outputs.main_private_subnet.cidr +} +resource "openstack_networking_secgroup_rule_v2" "igmp_ingress_between_k8s_nodes" { + security_group_id = openstack_networking_secgroup_v2.k8s_internal_traffic.id + description = "Ingress IGMP traffic between k8s nodes" + direction = "ingress" + ethertype = "IPv4" + protocol = "igmp" + remote_ip_prefix = "0.0.0.0/0" +} + +resource "openstack_networking_secgroup_rule_v2" "igmp_egress_between_k8s_nodes" { + security_group_id = openstack_networking_secgroup_v2.k8s_internal_traffic.id + description = "Egress IGMP traffic between k8s nodes" + direction = "egress" + ethertype = "IPv4" + protocol = "igmp" + remote_ip_prefix = "0.0.0.0/0" +} + +# Controllers VMs +# +resource "openstack_compute_instance_v2" "docker_k8s_controllers" { + count = var.docker_k8s_data.mgr_count + name = format("%s-%02d", var.docker_k8s_data.mgr_name, count.index + 1) + availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu + flavor_name = var.docker_k8s_data.mgr_flavor + key_pair = module.ssh_settings.ssh_key_name + security_groups = [openstack_networking_secgroup_v2.default.name, openstack_networking_secgroup_v2.k8s_internal_traffic.name,"default","nfs_share_no_ingress"] + scheduler_hints { + group = openstack_compute_servergroup_v2.k8s_masters.id + } + block_device { + uuid = var.ubuntu_2204.uuid + source_type = "image" + volume_size = 10 + boot_index = 0 + destination_type = "volume" + delete_on_termination = false + } + + block_device { + source_type = "blank" + volume_size = var.docker_k8s_data.mgr_data_disk_size + boot_index = -1 + destination_type = "volume" + delete_on_termination = false + } + + network { + name = var.main_private_network.name + fixed_ip_v4 = var.k8s_controllers_ip.* [count.index] + } + network { + name = var.k8s_nfs_private_network.network_name + } + + user_data = file("${var.ubuntu2204_data_file}") + depends_on = [openstack_networking_subnet_v2.k8s_nfs_subnet] + # Do not replace the instance when the ssh key changes + lifecycle { + ignore_changes = [ + # Ignore changes to tags, e.g. because a management agent + # updates these based on some ruleset managed elsewhere. + key_pair, user_data, network + ] + } +} + +# k8s worker nodes +resource "openstack_compute_instance_v2" "docker_k8s_workers" { + count = var.docker_k8s_data.worker_count + name = format("%s-%02d", var.docker_k8s_data.worker_name, count.index + 1) + availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu + flavor_name = var.docker_k8s_data.worker_flavor + key_pair = module.ssh_settings.ssh_key_name + security_groups = ["default", var.default_security_group_name, openstack_networking_secgroup_v2.k8s_internal_traffic.name,"nfs_share_no_ingress"] + scheduler_hints { + group = openstack_compute_servergroup_v2.k8s_workers.id + } + block_device { + uuid = var.ubuntu_2204.uuid + source_type = "image" + volume_size = 10 + boot_index = 0 + destination_type = "volume" + delete_on_termination = false + } + + block_device { + source_type = "blank" + volume_size = var.docker_k8s_data.worker_data_disk_size + boot_index = -1 + destination_type = "volume" + delete_on_termination = false + } + + network { + name = var.main_private_network.name + } + network { + name = var.k8s_nfs_private_network.network_name + } + network { + name = var.networks_list.shared_postgresql + } + + user_data = file("${module.common_variables.ubuntu2204_data_file}") + # Do not replace the instance when the ssh key changes + lifecycle { + ignore_changes = [ + # Ignore changes to tags, e.g. because a management agent + # updates these based on some ruleset managed elsewhere. + key_pair, user_data, network + ] + } +} diff --git a/openstack-tf/modules/common_variables/variables.tf b/openstack-tf/modules/common_variables/variables.tf index 1df55da..ed3d22d 100644 --- a/openstack-tf/modules/common_variables/variables.tf +++ b/openstack-tf/modules/common_variables/variables.tf @@ -116,7 +116,7 @@ variable "shared_postgresql_server_data" { type = map(string) default = { name = "shared-postgresql-server" - flavor = "m1.medium" + flavor = "m1.large" vol_data_name = "shared-postgresql-data" vol_data_size = "100" vol_data_device = "/dev/vdb" diff --git a/openstack-tf/modules/dns_resources/terraform-provider.tf b/openstack-tf/modules/dns_resources/terraform-provider.tf index a931880..01d3073 100644 --- a/openstack-tf/modules/dns_resources/terraform-provider.tf +++ b/openstack-tf/modules/dns_resources/terraform-provider.tf @@ -4,7 +4,7 @@ terraform { required_providers { openstack = { source = "terraform-provider-openstack/openstack" - version = "~> 1.53.0" + version = ">= 1.54.0" } } } diff --git a/openstack-tf/modules/main_private_net_and_dns_zone/terraform-provider.tf b/openstack-tf/modules/main_private_net_and_dns_zone/terraform-provider.tf index c597bdd..93fb909 100644 --- a/openstack-tf/modules/main_private_net_and_dns_zone/terraform-provider.tf +++ b/openstack-tf/modules/main_private_net_and_dns_zone/terraform-provider.tf @@ -4,7 +4,7 @@ required_version = ">= 0.14.0" required_providers { openstack = { source = "terraform-provider-openstack/openstack" - version = "~> 1.53.0" + version = ">= 1.53.0" } } } diff --git a/openstack-tf/modules/ssh_keys/ssh-keys.tf b/openstack-tf/modules/ssh_keys/ssh-keys.tf index ec43a1d..7f2d987 100644 --- a/openstack-tf/modules/ssh_keys/ssh-keys.tf +++ b/openstack-tf/modules/ssh_keys/ssh-keys.tf @@ -4,7 +4,7 @@ required_version = ">= 0.14.0" required_providers { openstack = { source = "terraform-provider-openstack/openstack" - version = "~> 1.53.0" + version = ">= 1.54.0" } } }