From d6daf6315f248ca7b04e5138e1d502746a915187 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 5 Dec 2023 17:46:36 +0100 Subject: [PATCH] Switched geoserver to instance_with_data_volume module --- .../d4s-dev/geoserver/.terraform.lock.hcl | 1 + openstack-tf/d4s-dev/geoserver/main.tf | 88 ++++++++++++------- 2 files changed, 58 insertions(+), 31 deletions(-) diff --git a/openstack-tf/d4s-dev/geoserver/.terraform.lock.hcl b/openstack-tf/d4s-dev/geoserver/.terraform.lock.hcl index 95c8b6a2..e3e6a96a 100644 --- a/openstack-tf/d4s-dev/geoserver/.terraform.lock.hcl +++ b/openstack-tf/d4s-dev/geoserver/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/terraform-provider-openstack/openstack" { constraints = "~> 1.53.0" hashes = [ "h1:YLGvYkSuagyP5orUTyKNK+JhzS17EFTUDpZ5R5/fFv4=", + "h1:ZSJPqrlaHQ3sj7wyJuPSG+NblFZbAA6Y0d3GjSJf3o8=", "zh:09da7ca98ffd3de7b9ce36c4c13446212a6e763ba1162be71b50f95d453cb68e", "zh:14041bcbb87312411d88612056ed185650bfd01284b8ea0761ce8105a331708e", "zh:35bf4c788fdbc17c8e40ebc7b33c7de4b45a2fa2efaa657b10f0e3bd37c9627f", diff --git a/openstack-tf/d4s-dev/geoserver/main.tf b/openstack-tf/d4s-dev/geoserver/main.tf index 86531d43..569c5539 100644 --- a/openstack-tf/d4s-dev/geoserver/main.tf +++ b/openstack-tf/d4s-dev/geoserver/main.tf @@ -26,11 +26,10 @@ module "common_variables" { } -module "geo_service" { +module "instance_with_data_volume" { + source = "../../modules/instance_with_data_volume" - source = "../../modules/geo_services" - - geo_service_instances_map = { + instances_with_data_volume_map = { geona = { name = "geoserver-geona", description = "Geoserver geona instance", @@ -38,9 +37,12 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-geona_data_volume", - vol_data_size = "50" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-geona_data_volume", + size = "50", + device = "/dev/vdb" + } }, esquiline = { name = "geoserver-esquiline", @@ -49,9 +51,12 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-esquiline_data_volume", - vol_data_size = "20" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-esquiline_data_volume", + size = "20", + device = "/dev/vdb", + } }, ariadne = { name = "geoserver-ariadne", @@ -60,9 +65,12 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-ariadne_data_volume", - vol_data_size = "20" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-ariadne_data_volume", + size = "20", + device = "/dev/vdb", + } }, grsf = { name = "geoserver-grsf", @@ -72,8 +80,11 @@ module "geo_service" { security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-grsf_data_volume", - vol_data_size = "40" + volume = { + name = "geoserver-grsf_data_volume" + size = "40", + device = "/dev/vdb", + } }, protectedareaimpactmaps = { name = "geoserver-protectedareaimpactmaps", @@ -82,9 +93,12 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-protectedareaimpactmaps_data_volume", - vol_data_size = "70" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-protectedareaimpactmaps_data_volume" + size = "70", + device = "/dev/vdb", + } } sdi-lab = { name = "geoserver-sdi-lab", @@ -93,9 +107,12 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-sdi-lab_data_volume", - vol_data_size = "100" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-sdi-lab_data_volume", + size = "100", + device = "/dev/vdb", + } } tunaatlas = { name = "geoserver-tunaatlas", @@ -104,9 +121,12 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-tunaatlas_data_volume", - vol_data_size = "60" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-tunaatlas_data_volume", + size = "60", + device = "/dev/vdb", + } } wecafc-firms = { name = "geoserver-wecafc-firms", @@ -115,9 +135,12 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-wecafc-firms_data_volume", - vol_data_size = "40" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-wecafc-firms_data_volume", + size = "40", + device = "/dev/vdb", + } } aquacultureatlas = { name = "geoserver-aquacultureatlas", @@ -126,12 +149,15 @@ module "geo_service" { networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.shared_postgresql], security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [], - image_ref = module.common_variables.ubuntu_1804 - vol_data_name = "geoserver-aquacultureatlas_data_volume", - vol_data_size = "50" + image_ref = module.common_variables.ubuntu_1804, + volume = { + name = "geoserver-aquacultureatlas_data_volume", + size = "50", + device = "/dev/vdb", + } } } -} +} \ No newline at end of file