Porting changes from upstream #2

Merged
mauro.mugnaini merged 104 commits from InfraScience/infrastructure-as-code:main into main 2024-03-20 12:31:43 +01:00
1 changed files with 22 additions and 0 deletions
Showing only changes of commit 3b6d088b45 - Show all commits

View File

@ -182,6 +182,20 @@ module "instance_with_data_volume" {
size = "50",
device = "/dev/vdb",
}
},
geoserver_itineris_carbon = {
name = "geoserver-itineris-carbon",
description = "Geoserver itineris carbon instance",
flavor = module.common_variables.flavor_list.m1_large,
networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.shared_postgresql],
security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers],
server_groups_ids = [],
image_ref = module.common_variables.ubuntu_1804,
volume = {
name = "geoserver_itineris_carbon_data_volume",
size = "40",
device = "/dev/vdb",
}
}
}
}
@ -285,6 +299,14 @@ module "dns_records_create" {
ttl = 8600
type = "CNAME"
records = [local.cname_target]
},
geoserver-itineris-carbon = {
zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
name = join(".", ["geoserver-itineris-carbon", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
description = "Geoserver geoserver-itineris-carbon"
ttl = 8600
type = "CNAME"
records = [local.cname_target]
}
}
}