diff --git a/openstack-tf/d4s-production/geonetwork/main.tf b/openstack-tf/d4s-production/geonetwork/main.tf index 33cb3d6..13eeb4a 100644 --- a/openstack-tf/d4s-production/geonetwork/main.tf +++ b/openstack-tf/d4s-production/geonetwork/main.tf @@ -182,8 +182,8 @@ module "instance_with_data_volume" { device = "/dev/vdb" } }, - geonetwork_itineris_carbon = { - name = "geonetwork-itineris-carbon", + geonetwork_itineris = { + name = "geonetwork-itineris", 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], @@ -191,7 +191,7 @@ module "instance_with_data_volume" { image_ref = module.common_variables.ubuntu_1804 server_groups_ids = [], volume = { - name = "geonetwork_itineris_carbon_data_volume", + name = "geonetwork_itineris_data_volume", size = "20", device = "/dev/vdb" } @@ -298,10 +298,10 @@ module "dns_records_create" { type = "CNAME" records = [local.cname_target] }, - geonetwork-itineris-carbon = { + geonetwork-itineris = { zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id - name = join(".", ["geonetwork-itineris-carbon", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) - description = "Geonetwork geonetwork-itineris-carbon" + name = join(".", ["geonetwork-itineris", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) + description = "Geonetwork geonetwork-itineris" 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 1f18be3..909aee8 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": 52, + "serial": 61, "lineage": "08d2359a-f46e-f9fe-02d9-4cc9cfb46e25", "outputs": {}, "resources": [ @@ -552,13 +552,13 @@ ] }, { - "index_key": "geonetwork-itineris-carbon", + "index_key": "geonetwork-itineris", "schema_version": 0, "attributes": { - "description": "Geonetwork geonetwork-itineris-carbon", + "description": "Geonetwork geonetwork-itineris", "disable_status_check": false, - "id": "74135b34-1a9c-4c01-8cf0-22450a5660c4/72cf92f0-dc8c-43b5-ba62-87add21b45cf", - "name": "geonetwork-itineris-carbon.cloud.d4science.org.", + "id": "74135b34-1a9c-4c01-8cf0-22450a5660c4/63a2f9c8-5c08-4ccc-a6e6-76521489401a", + "name": "geonetwork-itineris.cloud.d4science.org.", "project_id": "1b45adf388934758b56d0dfdb4bfacf3", "records": [ "main-lb.cloud.d4science.org." @@ -921,7 +921,7 @@ ] }, { - "index_key": "geonetwork_itineris_carbon", + "index_key": "geonetwork_itineris", "schema_version": 0, "attributes": { "attachment": [], @@ -929,11 +929,11 @@ "consistency_group_id": null, "description": "", "enable_online_resize": null, - "id": "7776f0b1-6b5d-4226-b88d-3867738f2fc0", + "id": "e1fcc19d-bba3-47c6-bea1-0d6704cb88cb", "image_id": null, "metadata": {}, "multiattach": null, - "name": "geonetwork_itineris_carbon_data_volume", + "name": "geonetwork_itineris_data_volume", "region": "isti_area_pi_1", "scheduler_hints": [], "size": 20, @@ -1632,10 +1632,10 @@ ] }, { - "index_key": "geonetwork_itineris_carbon", + "index_key": "geonetwork_itineris", "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.45.138", + "access_ip_v4": "10.1.43.8", "access_ip_v6": "", "admin_pass": null, "all_metadata": {}, @@ -1658,34 +1658,34 @@ } ], "config_drive": null, - "created": "2024-02-05 14:46:40 +0000 UTC", + "created": "2024-03-26 10:05:55 +0000 UTC", "flavor_id": "10", "flavor_name": "m2.small", "floating_ip": null, "force_delete": false, - "id": "4662eadd-f8d1-492c-94d6-dfe708b54bd7", + "id": "ea1eac09-f678-4a26-b9cd-5808c19b0b9f", "image_id": "Attempt to boot from volume - no image supplied", "image_name": null, "key_pair": "Giancarlo Panichi", "metadata": null, - "name": "geonetwork-itineris-carbon", + "name": "geonetwork-itineris", "network": [ { "access_network": false, - "fixed_ip_v4": "10.1.45.138", + "fixed_ip_v4": "10.1.43.8", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:66:0f:4f", + "mac": "fa:16:3e:44:7b:32", "name": "d4s-production-cloud-main", "port": "", "uuid": "020df98d-ae72-452a-b376-3b6dc289acac" }, { "access_network": false, - "fixed_ip_v4": "192.168.1.51", + "fixed_ip_v4": "192.168.1.57", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:eb:c6:c7", + "mac": "fa:16:3e:f2:e7:3d", "name": "postgresql-srv-net", "port": "", "uuid": "f6450bc8-1345-4b52-8f34-2903c0cca7f8" @@ -1703,7 +1703,7 @@ "stop_before_destroy": false, "tags": null, "timeouts": null, - "updated": "2024-02-05 14:47:16 +0000 UTC", + "updated": "2024-03-26 10:07:01 +0000 UTC", "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", "vendor_options": [], "volume": [] @@ -2265,17 +2265,17 @@ ] }, { - "index_key": "geonetwork_itineris_carbon", + "index_key": "geonetwork_itineris", "schema_version": 0, "attributes": { "device": "/dev/vdb", - "id": "4662eadd-f8d1-492c-94d6-dfe708b54bd7/7776f0b1-6b5d-4226-b88d-3867738f2fc0", - "instance_id": "4662eadd-f8d1-492c-94d6-dfe708b54bd7", + "id": "ea1eac09-f678-4a26-b9cd-5808c19b0b9f/e1fcc19d-bba3-47c6-bea1-0d6704cb88cb", + "instance_id": "ea1eac09-f678-4a26-b9cd-5808c19b0b9f", "multiattach": null, "region": "isti_area_pi_1", "timeouts": null, "vendor_options": [], - "volume_id": "7776f0b1-6b5d-4226-b88d-3867738f2fc0" + "volume_id": "e1fcc19d-bba3-47c6-bea1-0d6704cb88cb" }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=",