Porting changes from upstream #2

Merged
mauro.mugnaini merged 104 commits from InfraScience/infrastructure-as-code:main into main 2024-03-20 12:31:43 +01:00
2 changed files with 78 additions and 21 deletions
Showing only changes of commit 26efafdfd5 - Show all commits

View File

@ -172,6 +172,14 @@ module "dns_records_create" {
ttl = 8600
type = "CNAME"
records = [local.cname_target]
},
workspace_repo = {
zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
name = join(".", ["workspace-repository", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
description = "Workspace repository (storagehub)"
ttl = 8600
type = "CNAME"
records = [local.cname_target]
}
}
}

View File

@ -1,7 +1,7 @@
{
"version": 4,
"terraform_version": "1.6.4",
"serial": 12,
"terraform_version": "1.6.6",
"serial": 14,
"lineage": "2fcb0d7a-4633-fecf-ab9f-0551f8d16805",
"outputs": {},
"resources": [
@ -404,7 +404,13 @@
"index_key": 0,
"schema_version": 0,
"attributes": {
"attachment": [],
"attachment": [
{
"device": "/dev/vdb",
"id": "9287ce45-8c5e-461c-950c-769765f8ec4d",
"instance_id": "9daff67b-8a3b-4c7e-8cdd-0fc21cf25599"
}
],
"availability_zone": "nova",
"consistency_group_id": null,
"description": "",
@ -430,7 +436,13 @@
"index_key": 1,
"schema_version": 0,
"attributes": {
"attachment": [],
"attachment": [
{
"device": "/dev/vdb",
"id": "392e7062-f02c-483f-a8c5-6caffa7ce201",
"instance_id": "3aa1326a-773a-4f19-8fdb-b4c691d6b251"
}
],
"availability_zone": "nova",
"consistency_group_id": null,
"description": "",
@ -464,7 +476,13 @@
"index_key": 0,
"schema_version": 0,
"attributes": {
"attachment": [],
"attachment": [
{
"device": "/dev/vdc",
"id": "08a1870c-2867-44ad-81c3-de0ed1b851d1",
"instance_id": "9daff67b-8a3b-4c7e-8cdd-0fc21cf25599"
}
],
"availability_zone": "nova",
"consistency_group_id": null,
"description": "",
@ -490,7 +508,13 @@
"index_key": 1,
"schema_version": 0,
"attributes": {
"attachment": [],
"attachment": [
{
"device": "/dev/vdc",
"id": "4072259f-11c2-4ef7-b149-be1a04b4ca12",
"instance_id": "3aa1326a-773a-4f19-8fdb-b4c691d6b251"
}
],
"availability_zone": "nova",
"consistency_group_id": null,
"description": "",
@ -589,7 +613,7 @@
"traffic_from_the_main_load_balancers"
],
"stop_before_destroy": false,
"tags": null,
"tags": [],
"timeouts": null,
"updated": "2024-02-06 16:26:45 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",
@ -679,7 +703,7 @@
"traffic_from_the_main_load_balancers"
],
"stop_before_destroy": false,
"tags": null,
"tags": [],
"timeouts": null,
"updated": "2024-02-06 16:26:48 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",
@ -866,6 +890,31 @@
"dependencies": [
"data.terraform_remote_state.privnet_dns_router"
]
},
{
"index_key": "workspace_repo",
"schema_version": 0,
"attributes": {
"description": "Workspace repository (storagehub)",
"disable_status_check": false,
"id": "74135b34-1a9c-4c01-8cf0-22450a5660c4/2e1c977d-9d08-4c96-9072-c09e624cdee8",
"name": "workspace-repository.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"
]
}
]
}