InfraScience
/
infrastructure-as-code
22
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Added geoserver and geonetwork for' (#14) from feature/26232 into main 

Reviewed-on: #14
This commit is contained in:
Giancarlo Panichi 2023-12-13 15:34:16 +01:00
parent 2ca84ac6eb f819872a18
commit bf6847de2b
2 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openstack-tf/d4s-production/geonetwork/main.tf
View File

@ -94,7 +94,7 @@ module "instance_with_data_volume" {
size = "20",
device = "/dev/vdb"
}
}
},
geonetwork_sdilab = {
name = "geonetwork-sdilab",
description = "This instance serves geonetwork service",
@ -165,6 +165,20 @@ module "instance_with_data_volume" {
device = "/dev/vdb"
}
},
geonetwork_globalfisheriesatlas = {
name = "geonetwork-globalfisheriesatlas",
description = "This instance serves geonetwork service",
flavor = module.common_variables.flavor_list.m2_small,
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geonetwork_server_group.id],
image_ref = module.common_variables.ubuntu_1804
volume = {
name = "geonetwork_globalfisheriesatlas_data_volume",
size = "20",
device = "/dev/vdb"
}
},
geonetwork_prod = {
name = "geonetwork-prod",
description = "This instance serves geonetwork service",

54
openstack-tf/d4s-production/geoserver/main.tf
View File

@ -42,7 +42,7 @@ module "instance_with_data_volume" {
name = "geoserver-geona",
description = "Geoserver geona instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -56,7 +56,7 @@ module "instance_with_data_volume" {
name = "geoserver-esquiline",
description = "Geoserver esquiline instance",
flavor = module.common_variables.flavor_list.m2_small,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -70,7 +70,7 @@ module "instance_with_data_volume" {
name = "geoserver-ariadne",
description = "Geoserver ariadne instance",
flavor = module.common_variables.flavor_list.m2_small,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -84,7 +84,7 @@ module "instance_with_data_volume" {
name = "geoserver-grsf",
description = "Geoserver grsf instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804
@ -98,7 +98,7 @@ module "instance_with_data_volume" {
name = "geoserver-protectedareaimpactmaps",
description = "Geoserver protectedareaimpactmaps instance",
flavor = module.common_variables.flavor_list.c1_large,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -107,12 +107,12 @@ module "instance_with_data_volume" {
size = "70",
device = "/dev/vdb",
}
}
},
geoserver_sdilab = {
name = "geoserver-sdilab",
description = "Geoserver sdilab instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -121,12 +121,12 @@ module "instance_with_data_volume" {
size = "100",
device = "/dev/vdb",
}
}
},
geoserver_tunaatlas = {
name = "geoserver-tunaatlas",
description = "Geoserver tunaatlas instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -135,12 +135,12 @@ module "instance_with_data_volume" {
size = "60",
device = "/dev/vdb",
}
}
},
geoserver_wecafcfirms = {
name = "geoserver-wecafcfirms",
description = "Geoserver wecafcfirms instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -149,12 +149,12 @@ module "instance_with_data_volume" {
size = "40",
device = "/dev/vdb",
}
}
},
geoserver_aquacultureatlas = {
name = "geoserver-aquacultureatlas",
description = "Geoserver aquacultureatlas instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-prod-cloud-main", module.common_variables.networks_list.shared_postgresql],
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
@ -163,6 +163,34 @@ module "instance_with_data_volume" {
size = "50",
device = "/dev/vdb",
}
},
geoserver_globalfisheriesatlas = {
name = "geoserver-globalfisheriesatlas",
description = "Geoserver globalfisheriesatlas instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
volume = {
name = "geoserver_globalfisheriesatlas_data_volume",
size = "50",
device = "/dev/vdb",
}
},
geoserver_marineenvironmentalindicators = {
name = "geoserver-marineenvironmentalindicators",
description = "Geoserver marineenvironmentalindicators instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = ["d4s-production-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 = [openstack_compute_servergroup_v2.geoserver_server_group.id],
image_ref = module.common_variables.ubuntu_1804,
volume = {
name = "geoserver_marineenvironmentalindicators_data_volume",
size = "50",
device = "/dev/vdb",
}
}
}
}