From 9eda26b17ecaa503829a624c1d60f4a1165a11ae Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 22 Jan 2024 18:05:23 +0100 Subject: [PATCH] Aggiunti i record DNS per phpmyadmin. --- hpc/wp-ecir2025/main.tf | 10 ++++- hpc/wp-ecir2025/terraform.tfstate | 38 +++++++++++++++--- kdd/wp-summerschool2024-sobigdata/main.tf | 10 ++++- .../terraform.tfstate | 40 +++++++++++++++---- 4 files changed, 83 insertions(+), 15 deletions(-) diff --git a/hpc/wp-ecir2025/main.tf b/hpc/wp-ecir2025/main.tf index 02a02fe..4a4753f 100644 --- a/hpc/wp-ecir2025/main.tf +++ b/hpc/wp-ecir2025/main.tf @@ -74,13 +74,21 @@ module "dns_records_create" { source = "../../modules/dns_resources" dns_resources_map = { - dm-pool-manager-pre = { + wp = { zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id name = join(".", ["wp-ecir2025", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.name]) description = "Wordpress for the ecir2025 conference" ttl = 8600 type = "A" records = [openstack_networking_floatingip_v2.wp_ecir2025_ip.address] + }, + phpadmin = { + zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id + name = join(".", ["phpadmin", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.name]) + description = "PHPMyAdmin for the Wordpress DB of the ecir 2025 conference" + ttl = 8600 + type = "CNAME" + records = [join(".", ["wp-ecir2025", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.name])] } } } \ No newline at end of file diff --git a/hpc/wp-ecir2025/terraform.tfstate b/hpc/wp-ecir2025/terraform.tfstate index 2140b37..0d64f76 100644 --- a/hpc/wp-ecir2025/terraform.tfstate +++ b/hpc/wp-ecir2025/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.6", - "serial": 9, + "serial": 14, "lineage": "ec304f3f-d6b9-1735-4842-4ce9e9750545", "outputs": {}, "resources": [ @@ -553,14 +553,14 @@ "description": "Wordpress for the ecir2025 conference", "dns_domain": "", "dns_name": "", - "fixed_ip": "", + "fixed_ip": "10.13.1.98", "id": "1c0c864c-29b7-400d-901e-ea6cca94d980", "pool": "external-network", - "port_id": "", + "port_id": "569f0239-b09a-4ebc-8343-3f4898f564d2", "region": "isti_area_pi_1", "subnet_id": null, "subnet_ids": null, - "tags": null, + "tags": [], "tenant_id": "adaf7e28a31e465795359fcde26398b7", "timeouts": null, "value_specs": null @@ -578,12 +578,38 @@ "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ { - "index_key": "dm-pool-manager-pre", + "index_key": "phpadmin", + "schema_version": 0, + "attributes": { + "description": "PHPMyAdmin for the Wordpress DB of the ecir 2025 conference", + "disable_status_check": false, + "id": "9d929715-2dd7-4859-a52a-bd148d2a6694/6c39592e-ffc6-4f9c-9e6a-06aa5b395e0a", + "name": "phpadmin.hpc.cloud.isti.cnr.it.", + "project_id": "adaf7e28a31e465795359fcde26398b7", + "records": [ + "wp-ecir2025.hpc.cloud.isti.cnr.it." + ], + "region": "isti_area_pi_1", + "timeouts": null, + "ttl": 8600, + "type": "CNAME", + "value_specs": null, + "zone_id": "9d929715-2dd7-4859-a52a-bd148d2a6694" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", + "openstack_networking_floatingip_v2.wp_ecir2025_ip" + ] + }, + { + "index_key": "wp", "schema_version": 0, "attributes": { "description": "Wordpress for the ecir2025 conference", "disable_status_check": false, - "id": "9d929715-2dd7-4859-a52a-bd148d2a6694/04fc9031-0855-41d2-a2cf-c1c135bb972e", + "id": "9d929715-2dd7-4859-a52a-bd148d2a6694/262f701b-0714-4082-9c5e-35106cdcfc7e", "name": "wp-ecir2025.hpc.cloud.isti.cnr.it.", "project_id": "adaf7e28a31e465795359fcde26398b7", "records": [ diff --git a/kdd/wp-summerschool2024-sobigdata/main.tf b/kdd/wp-summerschool2024-sobigdata/main.tf index 774b8da..518ad30 100644 --- a/kdd/wp-summerschool2024-sobigdata/main.tf +++ b/kdd/wp-summerschool2024-sobigdata/main.tf @@ -74,13 +74,21 @@ module "dns_records_create" { source = "../../modules/dns_resources" dns_resources_map = { - dm-pool-manager-pre = { + wp = { zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id name = join(".", ["wp-summerschool2024-sbd", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.name]) description = "Wordpress for the SobigData summer school 2024" ttl = 8600 type = "A" records = [openstack_networking_floatingip_v2.wp_summerschool2024_sobigdata_ip.address] + }, + phpadmin = { + zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id + name = join(".", ["phpadmin", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.name]) + description = "PHPMyAdmin for the Wordpress DB of the SobigData summer school 2024" + ttl = 8600 + type = "CNAME" + records = [join(".", ["wp-summerschool2024-sbd", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.name])] } } } \ No newline at end of file diff --git a/kdd/wp-summerschool2024-sobigdata/terraform.tfstate b/kdd/wp-summerschool2024-sobigdata/terraform.tfstate index 96d0171..48e2ab1 100644 --- a/kdd/wp-summerschool2024-sobigdata/terraform.tfstate +++ b/kdd/wp-summerschool2024-sobigdata/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.6", - "serial": 5, + "serial": 12, "lineage": "e54245b2-c34e-fc85-cb38-9260670b7d04", "outputs": {}, "resources": [ @@ -524,7 +524,7 @@ "default_for_all" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2024-01-22 12:52:37 +0000 UTC", "user_data": "094aad1c2a9d617fb2d4622557b2841486c0ecd7", @@ -553,14 +553,14 @@ "description": "Wordpress for the SobigData summer school 2024", "dns_domain": "", "dns_name": "", - "fixed_ip": "", + "fixed_ip": "10.12.3.160", "id": "42819ef2-e5ac-4e47-b013-9498243103b2", "pool": "external-network", - "port_id": "", + "port_id": "8747bbf3-c6a5-4655-949e-ae7ef4f6e8c7", "region": "isti_area_pi_1", "subnet_id": null, "subnet_ids": null, - "tags": null, + "tags": [], "tenant_id": "d6757d56e6e54ffe83a9701cc92af4c2", "timeouts": null, "value_specs": null @@ -578,12 +578,38 @@ "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ { - "index_key": "dm-pool-manager-pre", + "index_key": "phpadmin", + "schema_version": 0, + "attributes": { + "description": "PHPMyAdmin for the Wordpress DB of the SobigData summer school 2024", + "disable_status_check": false, + "id": "9d29d051-9567-4af4-9ffe-87eb643fc90b/31c83cb0-6505-41d6-bbc5-8f29fd00b8a6", + "name": "phpadmin.kdd.cloud.isti.cnr.it.", + "project_id": "d6757d56e6e54ffe83a9701cc92af4c2", + "records": [ + "wp-summerschool2024-sbd.kdd.cloud.isti.cnr.it." + ], + "region": "isti_area_pi_1", + "timeouts": null, + "ttl": 8600, + "type": "CNAME", + "value_specs": null, + "zone_id": "9d29d051-9567-4af4-9ffe-87eb643fc90b" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19", + "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", + "openstack_networking_floatingip_v2.wp_summerschool2024_sobigdata_ip" + ] + }, + { + "index_key": "wp", "schema_version": 0, "attributes": { "description": "Wordpress for the SobigData summer school 2024", "disable_status_check": false, - "id": "9d29d051-9567-4af4-9ffe-87eb643fc90b/02a56b50-061b-401f-98ad-be4aedacad15", + "id": "9d29d051-9567-4af4-9ffe-87eb643fc90b/f66fdd0a-b0e7-4ecd-9f29-bf5a024ca7de", "name": "wp-summerschool2024-sbd.kdd.cloud.isti.cnr.it.", "project_id": "d6757d56e6e54ffe83a9701cc92af4c2", "records": [