From 43418c2a0c46db4563add2a3572650ed8a594859 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 26 Jul 2024 11:26:31 +0200 Subject: [PATCH] Added geoserver-2 with Ubuntu 24.04 --- openstack-tf/d4s-dev/geoserver/main.tf | 71 ++- .../d4s-dev/geoserver/terraform.tfstate | 580 ++++++++++++++++++ 2 files changed, 632 insertions(+), 19 deletions(-) create mode 100644 openstack-tf/d4s-dev/geoserver/terraform.tfstate diff --git a/openstack-tf/d4s-dev/geoserver/main.tf b/openstack-tf/d4s-dev/geoserver/main.tf index cc4e4ac..3b8f3fd 100644 --- a/openstack-tf/d4s-dev/geoserver/main.tf +++ b/openstack-tf/d4s-dev/geoserver/main.tf @@ -24,28 +24,61 @@ module "common_variables" { source = "../../modules/common_variables" } +# Module used +module "ssh_settings" { + source = "../../modules/ssh-key-ref" +} -module "instance_with_data_volume" { - source = "../../modules/instance_with_data_volume" +# Volumes +resource "openstack_blockstorage_volume_v3" "geoserver_2_dev_data_volume" { + name = "geoserver_2_data_volume" + size = "20" +} - instances_with_data_volume_map = { - geoserver_next = { - name = "geoserver-next", - description = "Geoserver next instance", - flavor = module.common_variables.flavor_list.c1_medium, - 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_next_data_volume", - size = "20", - device = "/dev/vdb" - } + +# Geoservers +resource "openstack_compute_instance_v2" "geoserver_2_dev" { + name = "geoserver-2" + availability_zone_hints = module.common_variables.availability_zone_no_gpu_name + flavor_name = "m1.medium" + key_pair = module.ssh_settings.ssh_key_name + 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] + block_device { + uuid = module.common_variables.ubuntu_2404.uuid + source_type = "image" + volume_size = 10 + boot_index = 0 + destination_type = "volume" + delete_on_termination = false + } + + # Creates the networks according to input networks + dynamic "network" { + for_each = toset([data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.shared_postgresql]) + content { + name = network.value } } + + # user_data script used + user_data = file("${module.common_variables.ubuntu_2404.user_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 + ] + } } +resource "openstack_compute_volume_attach_v2" "geoserver_2_dev_attach" { + instance_id = openstack_compute_instance_v2.geoserver_2_dev.id + volume_id = openstack_blockstorage_volume_v3.geoserver_2_dev_data_volume.id + device = "/dev/vdb" +} + + locals { cname_target = "main-lb.${data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name}" @@ -58,10 +91,10 @@ module "dns_records_create" { source = "../../modules/dns_resources" dns_resources_map = { - geoserver-next = { + geoserver-2 = { zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id - name = join(".", ["geoserver-next", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) - description = "Geoserver geoserver-next" + name = join(".", ["geoserver-2", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) + description = "Geoserver geoserver-2" ttl = 8600 type = "CNAME" records = [local.cname_target] diff --git a/openstack-tf/d4s-dev/geoserver/terraform.tfstate b/openstack-tf/d4s-dev/geoserver/terraform.tfstate new file mode 100644 index 0000000..40db0fa --- /dev/null +++ b/openstack-tf/d4s-dev/geoserver/terraform.tfstate @@ -0,0 +1,580 @@ +{ + "version": 4, + "terraform_version": "1.6.4", + "serial": 5, + "lineage": "ee9a7e77-5d61-f866-c3d3-dbb0ae8bdf59", + "outputs": {}, + "resources": [ + { + "mode": "data", + "type": "terraform_remote_state", + "name": "privnet_dns_router", + "provider": "provider[\"terraform.io/builtin/terraform\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "backend": "local", + "config": { + "value": { + "path": "../project-setup/terraform.tfstate" + }, + "type": [ + "object", + { + "path": "string" + } + ] + }, + "defaults": null, + "outputs": { + "value": { + "almalinux_9": { + "name": "AlmaLinux-9.0-20220718", + "uuid": "541650fc-dd19-4f38-bb1d-7333ed9dd688" + }, + "availability_zone_no_gpu_name": "cnr-isti-nova-a", + "availability_zone_with_gpu_name": "cnr-isti-nova-gpu-a", + "availability_zones_names": { + "availability_zone_no_gpu": "cnr-isti-nova-a", + "availability_zone_with_gpu": "cnr-isti-nova-gpu-a" + }, + "basic_services_ip": { + "ca": "10.1.29.247", + "ca_cidr": "10.1.29.247/32", + "haproxy_l7_1": "10.1.28.50", + "haproxy_l7_1_cidr": "10.1.28.50/32", + "haproxy_l7_2": "10.1.30.241", + "haproxy_l7_2_cidr": "10.1.30.241/32", + "octavia_main": "10.1.28.227", + "octavia_main_cidr": "10.1.28.227/32", + "prometheus": "10.1.30.129", + "prometheus_cidr": "10.1.30.129/32", + "ssh_jump": "10.1.29.164", + "ssh_jump_cidr": "10.1.29.164/32" + }, + "centos_7": { + "name": "CentOS-7", + "uuid": "f0187a99-64f6-462a-ab5f-ef52fe62f2ca" + }, + "default_security_group_name": "default", + "dns_zone": { + "description": "DNS primary zone for the d4s-dev-cloud project", + "email": "postmaster@isti.cnr.it", + "ttl": "8600", + "zone_name": "cloud-dev.d4science.org." + }, + "dns_zone_id": "cbae638a-9d99-44aa-946c-0f5ffb7fc488", + "el7_data_file": "../../openstack_vm_data_scripts/el7.sh", + "external_gateway_ip": [ + { + "ip_address": "146.48.31.109", + "subnet_id": "57f87509-4016-46fb-b8c3-25fca7f72ccb" + } + ], + "external_network": { + "id": "1d2ff137-6ff7-4017-be2b-0d6c4af2353b", + "name": "external-network" + }, + "external_network_id": "1d2ff137-6ff7-4017-be2b-0d6c4af2353b", + "external_router": { + "description": "D4Science DEV main router", + "id": "2ae28c5f-036b-45db-bc9f-5bab8fa3e914", + "name": "d4s-dev-cloud-external-router" + }, + "flavor_list": { + "c1_large": "c1.large", + "c1_medium": "c1.medium", + "c1_small": "c1.small", + "c2_large": "c2.large", + "m1_large": "m1.large", + "m1_medium": "m1.medium", + "m1_xlarge": "m1.xlarge", + "m1_xxl": "m1.xxl", + "m2_large": "m2.large", + "m2_medium": "m2.medium", + "m2_small": "m2.small", + "m3_large": "m3.large" + }, + "floating_ip_pools": { + "main_public_ip_pool": "external-network" + }, + "haproxy_l7_data": { + "flavor": "m1.medium", + "haproxy_1": "haproxy-l7-1", + "haproxy_2": "haproxy-l7-2", + "name": "main-haproxy-l7", + "vm_count": "2" + }, + "internal_ca_data": { + "flavor": "m1.small", + "name": "ca" + }, + "main_haproxy_l7_ip": [ + "10.1.28.50", + "10.1.30.241" + ], + "main_private_network": { + "description": "D4Science DEV private network (use this as the main network)", + "name": "d4s-dev-cloud-main" + }, + "main_private_network_id": "e0af5eba-f24a-4d0d-8184-bc654b980c4a", + "main_private_subnet": { + "allocation_end": "10.1.31.254", + "allocation_start": "10.1.28.30", + "cidr": "10.1.28.0/22", + "description": "D4Science DEV main private subnet", + "gateway_ip": "10.1.28.1", + "name": "d4s-dev-cloud-sub" + }, + "main_region": "isti_area_pi_1", + "main_subnet_network_id": "2aa977f2-80b4-447c-a6b0-dfa06bf68751", + "mtu_size": 8942, + "networks_list": { + "cassandra": "cassandra-net", + "orientdb": "orientdb-net", + "orientdb_se": "orientdb-se-net", + "shared_postgresql": "postgresql-srv-net", + "swarm": "swarm-nfs-net", + "timescaledb": "timescaledb-net" + }, + "networks_with_d4s_services": { + "garr_ct1_net": "90.147.166.0/23", + "garr_na_net": "90.147.152.0/24", + "garr_pa1_net": "90.147.188.0/23", + "infrascience_net": "146.48.122.0/23", + "isti_net": "146.48.80.0/21", + "s2i2s_net": "146.48.28.0/22" + }, + "nfs_share_no_ingress_secgroup_id": "5887da8d-e362-4509-93ac-8a70bf8baef9", + "octavia_information": { + "main_lb_description": "Main L4 load balancer for the D4Science DEV", + "main_lb_hostname": "main-lb", + "main_lb_name": "lb-dev-l4", + "octavia_flavor": "octavia_amphora-mvcpu-ha", + "octavia_flavor_id": "394988b5-6603-4a1e-a939-8e177c6681c7" + }, + "os_project_data": { + "id": "e8f8ca72f30648a8b389b4e745ac83a9" + }, + "policy_list": { + "affinity": "affinity", + "anti_affinity": "anti-affinity", + "soft_affinity": "soft-affinity", + "soft_anti_affinity": "soft-anti-affinity" + }, + "prometheus_server_data": { + "flavor": "m1.medium", + "name": "prometheus", + "public_grafana_server_cidr": "146.48.28.103/32", + "vol_data_device": "/dev/vdb", + "vol_data_name": "prometheus-data", + "vol_data_size": "100" + }, + "resolvers_ip": [ + "146.48.29.97", + "146.48.29.98", + "146.48.29.99" + ], + "resource_registry_addresses": {}, + "security_group_list": { + "acaland": "acaland's dev machine", + "access_to_orientdb": "access_to_orientdb", + "access_to_orientdb_se": "access_to_orientdb_se", + "access_to_the_timescaledb_service": "access_to_the_timescaledb_service", + "cassandra": "Cassandra", + "dataminer-publish": "dataminer-publish", + "debugging_from_jump_node": "debugging_from_jump_node", + "default": "default", + "docker_swarm": "Docker Swarm", + "docker_swarm_NFS": "Docker Swarm NFS", + "haproxy": "traffic_from_main_lb_to_haproxy_l7", + "http_and_https_from_the_load_balancers": "traffic_from_the_main_load_balancers", + "limited_HTTPS_access": "restricted_web_service", + "limited_SSH_access": "Limited SSH access", + "mongo": "mongo", + "nfs_share_no_ingress": "nfs_share_no_ingress", + "orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic", + "postgreSQL": "PostgreSQL service", + "public_HTTPS": "Public HTTPS" + }, + "shared_postgresql_server_data": { + "allocation_pool_end": "192.168.3.254", + "allocation_pool_start": "192.168.0.100", + "flavor": "m1.medium", + "name": "shared-postgresql-server", + "network_cidr": "192.168.0.0/22", + "network_description": "Network used to communicate with the shared postgresql service", + "network_name": "postgresql-srv-net", + "server_cidr": "192.168.0.5/22", + "server_ip": "192.168.0.5", + "vol_data_device": "/dev/vdb", + "vol_data_name": "shared-postgresql-data", + "vol_data_size": "100" + }, + "smartexecutor_addresses": {}, + "ssh_jump_proxy": { + "flavor": "m2.small", + "name": "ssh-jump-proxy" + }, + "ssh_sources": { + "d4s_vpn_1_cidr": "146.48.122.27/32", + "d4s_vpn_2_cidr": "146.48.122.49/32", + "infrascience_net_cidr": "146.48.122.0/23", + "s2i2s_vpn_1_cidr": "146.48.28.10/32", + "s2i2s_vpn_2_cidr": "146.48.28.11/32", + "shell_d4s_cidr": "146.48.122.95/32" + }, + "storage_nfs_network_id": "5f4023cc-4016-404c-94e5-86220095fbaf", + "storage_nfs_subnet_id": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696", + "ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", + "ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", + "ubuntu_1804": { + "name": "Ubuntu-Bionic-18.04", + "user_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", + "uuid": "7ed6a2cd-2b07-482e-8ce4-f018dff16c89" + }, + "ubuntu_2204": { + "name": "Ubuntu-Jammy-22.04", + "user_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", + "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627" + } + }, + "type": [ + "object", + { + "almalinux_9": [ + "map", + "string" + ], + "availability_zone_no_gpu_name": "string", + "availability_zone_with_gpu_name": "string", + "availability_zones_names": [ + "map", + "string" + ], + "basic_services_ip": [ + "map", + "string" + ], + "centos_7": [ + "map", + "string" + ], + "default_security_group_name": "string", + "dns_zone": [ + "map", + "string" + ], + "dns_zone_id": "string", + "el7_data_file": "string", + "external_gateway_ip": [ + "list", + [ + "object", + { + "ip_address": "string", + "subnet_id": "string" + } + ] + ], + "external_network": [ + "map", + "string" + ], + "external_network_id": "string", + "external_router": [ + "map", + "string" + ], + "flavor_list": [ + "map", + "string" + ], + "floating_ip_pools": [ + "map", + "string" + ], + "haproxy_l7_data": [ + "map", + "string" + ], + "internal_ca_data": [ + "map", + "string" + ], + "main_haproxy_l7_ip": [ + "list", + "string" + ], + "main_private_network": [ + "map", + "string" + ], + "main_private_network_id": "string", + "main_private_subnet": [ + "map", + "string" + ], + "main_region": "string", + "main_subnet_network_id": "string", + "mtu_size": "number", + "networks_list": [ + "map", + "string" + ], + "networks_with_d4s_services": [ + "map", + "string" + ], + "nfs_share_no_ingress_secgroup_id": "string", + "octavia_information": [ + "map", + "string" + ], + "os_project_data": [ + "map", + "string" + ], + "policy_list": [ + "map", + "string" + ], + "prometheus_server_data": [ + "map", + "string" + ], + "resolvers_ip": [ + "list", + "string" + ], + "resource_registry_addresses": [ + "map", + "string" + ], + "security_group_list": [ + "map", + "string" + ], + "shared_postgresql_server_data": [ + "map", + "string" + ], + "smartexecutor_addresses": [ + "map", + "string" + ], + "ssh_jump_proxy": [ + "map", + "string" + ], + "ssh_sources": [ + "map", + "string" + ], + "storage_nfs_network_id": "string", + "storage_nfs_subnet_id": "string", + "ubuntu1804_data_file": "string", + "ubuntu2204_data_file": "string", + "ubuntu_1804": [ + "map", + "string" + ], + "ubuntu_2204": [ + "map", + "string" + ] + } + ] + }, + "workspace": null + }, + "sensitive_attributes": [] + } + ] + }, + { + "mode": "managed", + "type": "openstack_blockstorage_volume_v3", + "name": "geoserver_2_dev_data_volume", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "attachment": [], + "availability_zone": "nova", + "backup_id": "", + "consistency_group_id": null, + "description": "", + "enable_online_resize": null, + "id": "5cdb6111-a3f2-4c18-b62c-e93f7519b93b", + "image_id": null, + "metadata": {}, + "name": "geoserver_2_data_volume", + "region": "isti_area_pi_1", + "scheduler_hints": [], + "size": 20, + "snapshot_id": "", + "source_replica": null, + "source_vol_id": "", + "timeouts": null, + "volume_type": "cephUnencrypted" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=" + } + ] + }, + { + "mode": "managed", + "type": "openstack_compute_instance_v2", + "name": "geoserver_2_dev", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "access_ip_v4": "10.1.29.51", + "access_ip_v6": "", + "admin_pass": null, + "all_metadata": {}, + "all_tags": [], + "availability_zone": "cnr-isti-nova-a", + "availability_zone_hints": "cnr-isti-nova-a", + "block_device": [ + { + "boot_index": 0, + "delete_on_termination": false, + "destination_type": "volume", + "device_type": "", + "disk_bus": "", + "guest_format": "", + "multiattach": false, + "source_type": "image", + "uuid": "fc3f705d-3cf5-4866-8ef6-ff6e2cdd4075", + "volume_size": 10, + "volume_type": "" + } + ], + "config_drive": null, + "created": "2024-07-26 09:24:10 +0000 UTC", + "flavor_id": "4", + "flavor_name": "m1.medium", + "force_delete": false, + "id": "fcd233c4-a5b5-4c03-bd43-f3b3415907f1", + "image_id": "Attempt to boot from volume - no image supplied", + "image_name": null, + "key_pair": "Giancarlo Panichi", + "metadata": null, + "name": "geoserver-2", + "network": [ + { + "access_network": false, + "fixed_ip_v4": "10.1.29.51", + "fixed_ip_v6": "", + "mac": "fa:16:3e:27:72:51", + "name": "d4s-dev-cloud-main", + "port": "", + "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" + }, + { + "access_network": false, + "fixed_ip_v4": "192.168.2.201", + "fixed_ip_v6": "", + "mac": "fa:16:3e:5a:38:15", + "name": "postgresql-srv-net", + "port": "", + "uuid": "00422a4a-4b8b-4c85-acf9-ef733df842b9" + } + ], + "network_mode": null, + "personality": [], + "power_state": "active", + "region": "isti_area_pi_1", + "scheduler_hints": [], + "security_groups": [ + "default", + "traffic_from_the_main_load_balancers" + ], + "stop_before_destroy": false, + "tags": null, + "timeouts": null, + "updated": "2024-07-26 09:25:59 +0000 UTC", + "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", + "vendor_options": [] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router" + ] + } + ] + }, + { + "mode": "managed", + "type": "openstack_compute_volume_attach_v2", + "name": "geoserver_2_dev_attach", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "device": "/dev/vdb", + "id": "fcd233c4-a5b5-4c03-bd43-f3b3415907f1/5cdb6111-a3f2-4c18-b62c-e93f7519b93b", + "instance_id": "fcd233c4-a5b5-4c03-bd43-f3b3415907f1", + "multiattach": null, + "region": "isti_area_pi_1", + "tag": null, + "timeouts": null, + "vendor_options": [], + "volume_id": "5cdb6111-a3f2-4c18-b62c-e93f7519b93b" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", + "openstack_blockstorage_volume_v3.geoserver_2_dev_data_volume", + "openstack_compute_instance_v2.geoserver_2_dev" + ] + } + ] + }, + { + "module": "module.dns_records_create", + "mode": "managed", + "type": "openstack_dns_recordset_v2", + "name": "add_dns_recordset", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "index_key": "geoserver-2", + "schema_version": 0, + "attributes": { + "description": "Geoserver geoserver-2", + "disable_status_check": false, + "id": "cbae638a-9d99-44aa-946c-0f5ffb7fc488/bedb2f86-18a5-4bf4-a424-08ed18c9bd8b", + "name": "geoserver-2.cloud-dev.d4science.org.", + "project_id": "e8f8ca72f30648a8b389b4e745ac83a9", + "records": [ + "main-lb.cloud-dev.d4science.org." + ], + "region": "isti_area_pi_1", + "timeouts": null, + "ttl": 8600, + "type": "CNAME", + "value_specs": null, + "zone_id": "cbae638a-9d99-44aa-946c-0f5ffb7fc488" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router" + ] + } + ] + } + ], + "check_results": null +}