diff --git a/openstack-tf/d4s-production/geoserver/main.tf b/openstack-tf/d4s-production/geoserver/main.tf index 988b155..68452fe 100644 --- a/openstack-tf/d4s-production/geoserver/main.tf +++ b/openstack-tf/d4s-production/geoserver/main.tf @@ -57,20 +57,6 @@ module "instance_with_data_volume" { device = "/dev/vdb", } }, - geoserver_ariadne = { - name = "geoserver-ariadne", - description = "Geoserver ariadne instance", - 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 = "geoserver_ariadne_data_volume", - size = "20", - device = "/dev/vdb", - } - }, geoserver_grsf = { name = "geoserver-grsf", description = "Geoserver grsf instance", @@ -242,14 +228,6 @@ module "dns_records_create" { type = "CNAME" records = [local.cname_target] }, - geoserver-ariadne = { - zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id - name = join(".", ["geoserver-ariadne", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) - description = "Geoserver geoserver-ariadne" - ttl = 8600 - type = "CNAME" - records = [local.cname_target] - }, geoserver-grsf = { zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id name = join(".", ["geoserver-grsf", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) diff --git a/openstack-tf/d4s-production/geoserver/terraform.tfstate b/openstack-tf/d4s-production/geoserver/terraform.tfstate index b6b58e8..93c73d6 100644 --- a/openstack-tf/d4s-production/geoserver/terraform.tfstate +++ b/openstack-tf/d4s-production/geoserver/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.4", - "serial": 56, + "serial": 61, "lineage": "de164650-89d7-4446-7bbf-4d84dd648c8e", "outputs": {}, "resources": [ @@ -426,31 +426,6 @@ "data.terraform_remote_state.privnet_dns_router" ] }, - { - "index_key": "geoserver-ariadne", - "schema_version": 0, - "attributes": { - "description": "Geoserver geoserver-ariadne", - "disable_status_check": false, - "id": "74135b34-1a9c-4c01-8cf0-22450a5660c4/600ee8ca-9ace-4a1c-9c6e-92657ce2dddf", - "name": "geoserver-ariadne.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": "geoserver-esquiline", "schema_version": 0, @@ -770,41 +745,6 @@ "data.terraform_remote_state.privnet_dns_router" ] }, - { - "index_key": "geoserver_ariadne", - "schema_version": 0, - "attributes": { - "attachment": [ - { - "device": "/dev/vdb", - "id": "82fc05d3-1903-49b7-8479-5dbb5a035a9c", - "instance_id": "61991170-8fa9-4822-a9f3-cff53a91b394" - } - ], - "availability_zone": "nova", - "consistency_group_id": null, - "description": "", - "enable_online_resize": null, - "id": "82fc05d3-1903-49b7-8479-5dbb5a035a9c", - "image_id": null, - "metadata": {}, - "multiattach": null, - "name": "geoserver_ariadne_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": "geoserver_esquiline", "schema_version": 0, @@ -984,7 +924,13 @@ "index_key": "geoserver_itineris_critical_zone", "schema_version": 0, "attributes": { - "attachment": [], + "attachment": [ + { + "device": "/dev/vdb", + "id": "870344b5-5621-42b6-a2a6-63c6e0058792", + "instance_id": "cdfdbe53-e0ac-4138-899c-4f7f1b5a0781" + } + ], "availability_zone": "nova", "consistency_group_id": null, "description": "", @@ -1276,89 +1222,6 @@ "data.terraform_remote_state.privnet_dns_router" ] }, - { - "index_key": "geoserver_ariadne", - "schema_version": 0, - "attributes": { - "access_ip_v4": "10.1.42.187", - "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": "2023-12-14 17:15:30 +0000 UTC", - "flavor_id": "10", - "flavor_name": "m2.small", - "floating_ip": null, - "force_delete": false, - "id": "61991170-8fa9-4822-a9f3-cff53a91b394", - "image_id": "Attempt to boot from volume - no image supplied", - "image_name": null, - "key_pair": "adellam", - "metadata": null, - "name": "geoserver-ariadne", - "network": [ - { - "access_network": false, - "fixed_ip_v4": "10.1.42.187", - "fixed_ip_v6": "", - "floating_ip": "", - "mac": "fa:16:3e:31:8d:6a", - "name": "d4s-production-cloud-main", - "port": "", - "uuid": "020df98d-ae72-452a-b376-3b6dc289acac" - }, - { - "access_network": false, - "fixed_ip_v4": "192.168.2.216", - "fixed_ip_v6": "", - "floating_ip": "", - "mac": "fa:16:3e:ec:7c:0d", - "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": [], - "timeouts": null, - "updated": "2023-12-14 17:16:24 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", - "vendor_options": [], - "volume": [] - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", - "dependencies": [ - "data.terraform_remote_state.privnet_dns_router" - ] - }, { "index_key": "geoserver_esquiline", "schema_version": 0, @@ -1844,7 +1707,7 @@ "traffic_from_the_main_load_balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2024-04-05 15:13:24 +0000 UTC", "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", @@ -2302,27 +2165,6 @@ "module.instance_with_data_volume.openstack_compute_instance_v2.instance_with_data_volume" ] }, - { - "index_key": "geoserver_ariadne", - "schema_version": 0, - "attributes": { - "device": "/dev/vdb", - "id": "61991170-8fa9-4822-a9f3-cff53a91b394/82fc05d3-1903-49b7-8479-5dbb5a035a9c", - "instance_id": "61991170-8fa9-4822-a9f3-cff53a91b394", - "multiattach": null, - "region": "isti_area_pi_1", - "timeouts": null, - "vendor_options": [], - "volume_id": "82fc05d3-1903-49b7-8479-5dbb5a035a9c" - }, - "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": "geoserver_esquiline", "schema_version": 0,