From b519cce6f88481c84b2b2bb174d2680e4c15e8df Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 5 Dec 2023 12:00:13 +0100 Subject: [PATCH] geoserver-new -> geoserver. --- openstack-tf/d4s-dev/geoserver/geoserver.tf | 1 - openstack-tf/d4s-dev/geoserver/main.tf | 119 +++++++++++++++ .../d4s-dev/geoserver/variables-dev.tf | 1 - .../d4s-dev/geoserver/variables-geoserver.tf | 84 ----------- openstack-tf/d4s-dev/geoserver/variables.tf | 1 - .../d4s-dev/geoserver_new/.terraform.lock.hcl | 24 --- openstack-tf/d4s-dev/geoserver_new/main.tf | 137 ------------------ .../d4s-dev/geoserver_new/provider.tf | 3 - 8 files changed, 119 insertions(+), 251 deletions(-) delete mode 120000 openstack-tf/d4s-dev/geoserver/geoserver.tf delete mode 120000 openstack-tf/d4s-dev/geoserver/variables-dev.tf delete mode 100644 openstack-tf/d4s-dev/geoserver/variables-geoserver.tf delete mode 120000 openstack-tf/d4s-dev/geoserver/variables.tf delete mode 100644 openstack-tf/d4s-dev/geoserver_new/.terraform.lock.hcl delete mode 100644 openstack-tf/d4s-dev/geoserver_new/main.tf delete mode 100644 openstack-tf/d4s-dev/geoserver_new/provider.tf diff --git a/openstack-tf/d4s-dev/geoserver/geoserver.tf b/openstack-tf/d4s-dev/geoserver/geoserver.tf deleted file mode 120000 index e934684..0000000 --- a/openstack-tf/d4s-dev/geoserver/geoserver.tf +++ /dev/null @@ -1 +0,0 @@ -../../modules/geoserver/geoserver.tf \ No newline at end of file diff --git a/openstack-tf/d4s-dev/geoserver/main.tf b/openstack-tf/d4s-dev/geoserver/main.tf index e3df3d8..86531d4 100644 --- a/openstack-tf/d4s-dev/geoserver/main.tf +++ b/openstack-tf/d4s-dev/geoserver/main.tf @@ -16,3 +16,122 @@ data "terraform_remote_state" "privnet_dns_router" { path = "../project-setup/terraform.tfstate" } } + + +# +# Uses common_variables as module +# +module "common_variables" { + source = "../../modules/common_variables" +} + + +module "geo_service" { + + source = "../../modules/geo_services" + + geo_service_instances_map = { + geona = { + name = "geoserver-geona", + description = "Geoserver geona instance", + flavor = module.common_variables.flavor_list.m1_large, + 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" + }, + esquiline = { + name = "geoserver-esquiline", + description = "Geoserver esquiline instance", + flavor = module.common_variables.flavor_list.m2_small, + 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" + }, + ariadne = { + name = "geoserver-ariadne", + description = "Geoserver ariadne instance", + flavor = module.common_variables.flavor_list.m2_small, + 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" + }, + grsf = { + name = "geoserver-grsf", + description = "Geoserver grsf instance", + flavor = module.common_variables.flavor_list.m1_large, + 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-grsf_data_volume", + vol_data_size = "40" + }, + protectedareaimpactmaps = { + name = "geoserver-protectedareaimpactmaps", + description = "Geoserver protectedareaimpactmaps instance", + flavor = module.common_variables.flavor_list.c1_large, + 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" + } + sdi-lab = { + name = "geoserver-sdi-lab", + description = "Geoserver sdi-lab instance", + flavor = module.common_variables.flavor_list.m1_large, + 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" + } + tunaatlas = { + name = "geoserver-tunaatlas", + description = "Geoserver tunaatlas instance", + flavor = module.common_variables.flavor_list.m1_large, + 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" + } + wecafc-firms = { + name = "geoserver-wecafc-firms", + description = "Geoserver wecafc-firms instance", + flavor = module.common_variables.flavor_list.m1_large, + 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" + } + aquacultureatlas = { + name = "geoserver-aquacultureatlas", + description = "Geoserver aquacultureatlas instance", + flavor = module.common_variables.flavor_list.m1_large, + 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" + } + + } + + +} diff --git a/openstack-tf/d4s-dev/geoserver/variables-dev.tf b/openstack-tf/d4s-dev/geoserver/variables-dev.tf deleted file mode 120000 index fde4869..0000000 --- a/openstack-tf/d4s-dev/geoserver/variables-dev.tf +++ /dev/null @@ -1 +0,0 @@ -../variables/variables-dev.tf \ No newline at end of file diff --git a/openstack-tf/d4s-dev/geoserver/variables-geoserver.tf b/openstack-tf/d4s-dev/geoserver/variables-geoserver.tf deleted file mode 100644 index 265b335..0000000 --- a/openstack-tf/d4s-dev/geoserver/variables-geoserver.tf +++ /dev/null @@ -1,84 +0,0 @@ -#Default geoserver vol_data_device -variable "geoserver_basic_data" { - type = map(string) - default = { - vol_data_device = "/dev/vdb" - } -} - -#Geoserver instances Map -variable "geoserver_instances_map" { - type = map(object({ - name = string - description = string - flavor = string - vol_data_name = string - vol_data_size = string - })) - default = { - geona = { - name = "geoserver-geona", - description = "Geoserver geona instance", - flavor = "m1.xlarge", - vol_data_name = "geoserver-geona_data_volume", - vol_data_size = "50" - } - esquiline = { - name = "geoserver-esquiline", - description = "Geoserver esquiline instance", - flavor = "m2.small", - vol_data_name = "geoserver-esquiline_data_volume", - vol_data_size = "20" - } - ariadne = { - name = "geoserver-ariadne", - description = "Geoserver ariadne instance", - flavor = "m2.small", - vol_data_name = "geoserver-ariadne_data_volume", - vol_data_size = "20" - } - grsf = { - name = "geoserver-grsf", - description = "Geoserver grsf instance", - flavor = "m1.large", - vol_data_name = "geoserver-grsf_data_volume", - vol_data_size = "40" - } - protectedareaimpactmaps = { - name = "geoserver-protectedareaimpactmaps", - description = "Geoserver protectedareaimpactmaps instance", - flavor = "c1.large", - vol_data_name = "geoserver-protectedareaimpactmaps_data_volume", - vol_data_size = "70" - } - sdi-lab = { - name = "geoserver-sdi-lab", - description = "Geoserver sdi-lab instance", - flavor = "m1.large", - vol_data_name = "geoserver-sdi-lab_data_volume", - vol_data_size = "100" - } - tunaatlas = { - name = "geoserver-tunaatlas", - description = "Geoserver tunaatlas instance", - flavor = "m1.large", - vol_data_name = "geoserver-tunaatlas_data_volume", - vol_data_size = "60" - } - wecafc-firms = { - name = "geoserver-wecafc-firms", - description = "Geoserver wecafc-firms instance", - flavor = "m1.large", - vol_data_name = "geoserver-wecafc-firms_data_volume", - vol_data_size = "40" - } - aquacultureatlas = { - name = "geoserver-aquacultureatlas", - description = "Geoserver aquacultureatlas instance", - flavor = "m1.large", - vol_data_name = "geoserver-aquacultureatlas_data_volume", - vol_data_size = "50" - } - } - -} diff --git a/openstack-tf/d4s-dev/geoserver/variables.tf b/openstack-tf/d4s-dev/geoserver/variables.tf deleted file mode 120000 index be9f787..0000000 --- a/openstack-tf/d4s-dev/geoserver/variables.tf +++ /dev/null @@ -1 +0,0 @@ -../../modules/common_variables/variables.tf \ No newline at end of file diff --git a/openstack-tf/d4s-dev/geoserver_new/.terraform.lock.hcl b/openstack-tf/d4s-dev/geoserver_new/.terraform.lock.hcl deleted file mode 100644 index 95c8b6a..0000000 --- a/openstack-tf/d4s-dev/geoserver_new/.terraform.lock.hcl +++ /dev/null @@ -1,24 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/terraform-provider-openstack/openstack" { - version = "1.53.0" - constraints = "~> 1.53.0" - hashes = [ - "h1:YLGvYkSuagyP5orUTyKNK+JhzS17EFTUDpZ5R5/fFv4=", - "zh:09da7ca98ffd3de7b9ce36c4c13446212a6e763ba1162be71b50f95d453cb68e", - "zh:14041bcbb87312411d88612056ed185650bfd01284b8ea0761ce8105a331708e", - "zh:35bf4c788fdbc17c8e40ebc7b33c7de4b45a2fa2efaa657b10f0e3bd37c9627f", - "zh:46ede8ef4cfa12d654c538afc1e1ec34a1f3e8eb4e986ee23dceae398b7176a6", - "zh:59675734990dab1e8d87997853ea75e8104bba730b3f5a7146ac735540c9d6bf", - "zh:6de52428849806498670e827b54810be7510a2a79449602c1aede4235a0ec036", - "zh:78b2a20601272afceffac8f8ca78a6b647b84196c0dd8dc710fae297f6be15a4", - "zh:7c41ed3a4fac09677e676ecf9f9edd1e38eef449e656cb01a848d2c799c6de8f", - "zh:852800228f4118a4aa6cfaa4468b851247cbed6f037fd204f08de69eb1edc149", - "zh:86d618e7f9a07d978b8bc4b190be350a00de64ec535f9c8f5dfe133542a55483", - "zh:963a9e72b66d8bcf43de9b14a674ae3ca3719ce2f829217f7a65b66fc3773397", - "zh:a8e72ab67795071bda61f99a6de3d2d40122fb51971768fd75e1324abe874ced", - "zh:ce1890cf3af17d569af3bc7673cec0a8f78e6f5d701767593f3d29c551f44848", - "zh:e6f1b96eb684f527a47f71923f268c86a36d7894751b31ee9e726d7502a639cd", - ] -} diff --git a/openstack-tf/d4s-dev/geoserver_new/main.tf b/openstack-tf/d4s-dev/geoserver_new/main.tf deleted file mode 100644 index 86531d4..0000000 --- a/openstack-tf/d4s-dev/geoserver_new/main.tf +++ /dev/null @@ -1,137 +0,0 @@ -# Define required providers -terraform { - required_version = ">= 0.14.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" - } -} - - -# -# Uses common_variables as module -# -module "common_variables" { - source = "../../modules/common_variables" -} - - -module "geo_service" { - - source = "../../modules/geo_services" - - geo_service_instances_map = { - geona = { - name = "geoserver-geona", - description = "Geoserver geona instance", - flavor = module.common_variables.flavor_list.m1_large, - 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" - }, - esquiline = { - name = "geoserver-esquiline", - description = "Geoserver esquiline instance", - flavor = module.common_variables.flavor_list.m2_small, - 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" - }, - ariadne = { - name = "geoserver-ariadne", - description = "Geoserver ariadne instance", - flavor = module.common_variables.flavor_list.m2_small, - 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" - }, - grsf = { - name = "geoserver-grsf", - description = "Geoserver grsf instance", - flavor = module.common_variables.flavor_list.m1_large, - 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-grsf_data_volume", - vol_data_size = "40" - }, - protectedareaimpactmaps = { - name = "geoserver-protectedareaimpactmaps", - description = "Geoserver protectedareaimpactmaps instance", - flavor = module.common_variables.flavor_list.c1_large, - 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" - } - sdi-lab = { - name = "geoserver-sdi-lab", - description = "Geoserver sdi-lab instance", - flavor = module.common_variables.flavor_list.m1_large, - 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" - } - tunaatlas = { - name = "geoserver-tunaatlas", - description = "Geoserver tunaatlas instance", - flavor = module.common_variables.flavor_list.m1_large, - 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" - } - wecafc-firms = { - name = "geoserver-wecafc-firms", - description = "Geoserver wecafc-firms instance", - flavor = module.common_variables.flavor_list.m1_large, - 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" - } - aquacultureatlas = { - name = "geoserver-aquacultureatlas", - description = "Geoserver aquacultureatlas instance", - flavor = module.common_variables.flavor_list.m1_large, - 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" - } - - } - - -} diff --git a/openstack-tf/d4s-dev/geoserver_new/provider.tf b/openstack-tf/d4s-dev/geoserver_new/provider.tf deleted file mode 100644 index fa7a121..0000000 --- a/openstack-tf/d4s-dev/geoserver_new/provider.tf +++ /dev/null @@ -1,3 +0,0 @@ -provider "openstack" { - cloud = "d4s-dev" -}