From 2b598fbef4a7456e37c7253e3d668ad0bc7bb474 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 8 May 2024 15:04:02 +0200 Subject: [PATCH] Added aquacultureatlas geonetwork --- .../d4s-production/geonetwork/main.tf | 24 ++- .../geonetwork/terraform.tfstate | 160 +++++++++++++++++- 2 files changed, 182 insertions(+), 2 deletions(-) diff --git a/openstack-tf/d4s-production/geonetwork/main.tf b/openstack-tf/d4s-production/geonetwork/main.tf index 2fad2b4..a367625 100644 --- a/openstack-tf/d4s-production/geonetwork/main.tf +++ b/openstack-tf/d4s-production/geonetwork/main.tf @@ -181,7 +181,21 @@ module "instance_with_data_volume" { size = "20", device = "/dev/vdb" } - } + }, + geonetwork_aquacultureatlas = { + name = "geonetwork-aquacultureatlas", + description = "This instance serves geonetwork service", + flavor = module.common_variables.flavor_list.m2_small, + 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 = "geonetwork_aquacultureatlas_data_volume", + size = "20", + device = "/dev/vdb" + } + }, } } @@ -283,6 +297,14 @@ module "dns_records_create" { ttl = 8600 type = "CNAME" records = [local.cname_target] + }, + geonetwork-aquacultureatlas = { + zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id + name = join(".", ["geonetwork-aquacultureatlas", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) + description = "Geonetwork geonetwork-aquacultureatlas" + ttl = 8600 + type = "CNAME" + records = [local.cname_target] } } } diff --git a/openstack-tf/d4s-production/geonetwork/terraform.tfstate b/openstack-tf/d4s-production/geonetwork/terraform.tfstate index 29f4ab0..5bb0466 100644 --- a/openstack-tf/d4s-production/geonetwork/terraform.tfstate +++ b/openstack-tf/d4s-production/geonetwork/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.4", - "serial": 76, + "serial": 81, "lineage": "08d2359a-f46e-f9fe-02d9-4cc9cfb46e25", "outputs": {}, "resources": [ @@ -401,6 +401,31 @@ "name": "add_dns_recordset", "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ + { + "index_key": "geonetwork-aquacultureatlas", + "schema_version": 0, + "attributes": { + "description": "Geonetwork geonetwork-aquacultureatlas", + "disable_status_check": false, + "id": "74135b34-1a9c-4c01-8cf0-22450a5660c4/ef1fb5e7-ba0a-4b60-8ad4-f5687f1ece2a", + "name": "geonetwork-aquacultureatlas.cloud.d4science.org.", + "project_id": "1b45adf388934758b56d0dfdb4bfacf3", + "records": [ + "main-lb.cloud.d4science.org." + ], + "region": "isti_area_pi_1", + "timeouts": null, + "ttl": 8600, + "type": "CNAME", + "value_specs": null, + "zone_id": "74135b34-1a9c-4c01-8cf0-22450a5660c4" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router" + ] + }, { "index_key": "geonetwork-bluecloud", "schema_version": 0, @@ -685,6 +710,35 @@ "name": "instance_data_volume", "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ + { + "index_key": "geonetwork_aquacultureatlas", + "schema_version": 0, + "attributes": { + "attachment": [], + "availability_zone": "nova", + "consistency_group_id": null, + "description": "", + "enable_online_resize": null, + "id": "ea23e97d-23af-440d-b93c-f995b23fdb56", + "image_id": null, + "metadata": {}, + "multiattach": null, + "name": "geonetwork_aquacultureatlas_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=", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router" + ] + }, { "index_key": "geonetwork_bluecloud", "schema_version": 0, @@ -1079,6 +1133,89 @@ "name": "instance_with_data_volume", "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ + { + "index_key": "geonetwork_aquacultureatlas", + "schema_version": 0, + "attributes": { + "access_ip_v4": "10.1.45.145", + "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": "7ed6a2cd-2b07-482e-8ce4-f018dff16c89", + "volume_size": 10, + "volume_type": "" + } + ], + "config_drive": null, + "created": "2024-05-08 13:02:28 +0000 UTC", + "flavor_id": "10", + "flavor_name": "m2.small", + "floating_ip": null, + "force_delete": false, + "id": "a066d736-0227-4c43-9a9d-397efce99c4b", + "image_id": "Attempt to boot from volume - no image supplied", + "image_name": null, + "key_pair": "Giancarlo Panichi", + "metadata": null, + "name": "geonetwork-aquacultureatlas", + "network": [ + { + "access_network": false, + "fixed_ip_v4": "10.1.45.145", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:28:1d:08", + "name": "d4s-production-cloud-main", + "port": "", + "uuid": "020df98d-ae72-452a-b376-3b6dc289acac" + }, + { + "access_network": false, + "fixed_ip_v4": "192.168.0.190", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:7f:55:7f", + "name": "postgresql-srv-net", + "port": "", + "uuid": "f6450bc8-1345-4b52-8f34-2903c0cca7f8" + } + ], + "network_mode": null, + "personality": [], + "power_state": "active", + "region": "isti_area_pi_1", + "scheduler_hints": [], + "security_groups": [ + "default_for_all", + "traffic_from_the_main_load_balancers" + ], + "stop_before_destroy": false, + "tags": null, + "timeouts": null, + "updated": "2024-05-08 13:03:22 +0000 UTC", + "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "vendor_options": [], + "volume": [] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router" + ] + }, { "index_key": "geonetwork_bluecloud", "schema_version": 0, @@ -2001,6 +2138,27 @@ "name": "attach_volume", "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ + { + "index_key": "geonetwork_aquacultureatlas", + "schema_version": 0, + "attributes": { + "device": "/dev/vdb", + "id": "a066d736-0227-4c43-9a9d-397efce99c4b/ea23e97d-23af-440d-b93c-f995b23fdb56", + "instance_id": "a066d736-0227-4c43-9a9d-397efce99c4b", + "multiattach": null, + "region": "isti_area_pi_1", + "timeouts": null, + "vendor_options": [], + "volume_id": "ea23e97d-23af-440d-b93c-f995b23fdb56" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", + "module.instance_with_data_volume.openstack_blockstorage_volume_v3.instance_data_volume", + "module.instance_with_data_volume.openstack_compute_instance_v2.instance_with_data_volume" + ] + }, { "index_key": "geonetwork_bluecloud", "schema_version": 0,