Porting changes from upstream #2
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": 4,
|
||||
"terraform_version": "1.6.6",
|
||||
"serial": 12,
|
||||
"serial": 14,
|
||||
"lineage": "194691ec-f344-4bd2-98ae-cbd15e9c9cdf",
|
||||
"outputs": {
|
||||
"almalinux_9": {
|
||||
|
@ -259,6 +259,10 @@
|
|||
"string"
|
||||
]
|
||||
},
|
||||
"nfs_share_no_ingress_secgroup_id": {
|
||||
"value": "5887da8d-e362-4509-93ac-8a70bf8baef9",
|
||||
"type": "string"
|
||||
},
|
||||
"octavia_information": {
|
||||
"value": {
|
||||
"main_lb_description": "Main L4 load balancer for the D4Science DEV",
|
||||
|
@ -407,6 +411,10 @@
|
|||
"value": "5f4023cc-4016-404c-94e5-86220095fbaf",
|
||||
"type": "string"
|
||||
},
|
||||
"storage_nfs_subnet_id": {
|
||||
"value": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696",
|
||||
"type": "string"
|
||||
},
|
||||
"ubuntu1804_data_file": {
|
||||
"value": "../../openstack_vm_data_scripts/ubuntu1804.sh",
|
||||
"type": "string"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": 4,
|
||||
"terraform_version": "1.6.6",
|
||||
"serial": 38,
|
||||
"serial": 40,
|
||||
"lineage": "6d43430c-e6aa-d370-b6d5-22f2281117df",
|
||||
"outputs": {
|
||||
"almalinux_9": {
|
||||
|
@ -260,6 +260,10 @@
|
|||
"string"
|
||||
]
|
||||
},
|
||||
"nfs_share_no_ingress_secgroup_id": {
|
||||
"value": "ddb16502-7217-4677-a8a7-ca0cbf9a779a",
|
||||
"type": "string"
|
||||
},
|
||||
"octavia_information": {
|
||||
"value": {
|
||||
"main_lb_description": "Main L4 load balancer for the D4Science PRE production",
|
||||
|
@ -411,6 +415,10 @@
|
|||
"value": "5f4023cc-4016-404c-94e5-86220095fbaf",
|
||||
"type": "string"
|
||||
},
|
||||
"storage_nfs_subnet_id": {
|
||||
"value": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696",
|
||||
"type": "string"
|
||||
},
|
||||
"ubuntu1804_data_file": {
|
||||
"value": "../../openstack_vm_data_scripts/ubuntu1804.sh",
|
||||
"type": "string"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": 4,
|
||||
"terraform_version": "1.6.6",
|
||||
"serial": 19,
|
||||
"serial": 26,
|
||||
"lineage": "6d54ddff-c4ea-b8c7-3b92-53ed6c62db24",
|
||||
"outputs": {
|
||||
"almalinux_9": {
|
||||
|
@ -259,6 +259,10 @@
|
|||
"string"
|
||||
]
|
||||
},
|
||||
"nfs_share_no_ingress_secgroup_id": {
|
||||
"value": "167e4897-f776-4cbd-986f-77313aa68af2",
|
||||
"type": "string"
|
||||
},
|
||||
"octavia_information": {
|
||||
"value": {
|
||||
"main_lb_description": "Main L4 load balancer for the D4Science production",
|
||||
|
@ -408,6 +412,10 @@
|
|||
"value": "5f4023cc-4016-404c-94e5-86220095fbaf",
|
||||
"type": "string"
|
||||
},
|
||||
"storage_nfs_subnet_id": {
|
||||
"value": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696",
|
||||
"type": "string"
|
||||
},
|
||||
"ubuntu1804_data_file": {
|
||||
"value": "../../openstack_vm_data_scripts/ubuntu1804.sh",
|
||||
"type": "string"
|
||||
|
@ -440,6 +448,38 @@
|
|||
}
|
||||
},
|
||||
"resources": [
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_dns_recordset_v2",
|
||||
"name": "acme_challenge_recordset",
|
||||
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"description": "ACME challenge delegation",
|
||||
"disable_status_check": false,
|
||||
"id": "74135b34-1a9c-4c01-8cf0-22450a5660c4/7c71df0f-a8da-4ab0-a2f1-d4d4a93600e0",
|
||||
"name": "_acme-challenge.cloud.d4science.org.",
|
||||
"project_id": "1b45adf388934758b56d0dfdb4bfacf3",
|
||||
"records": [
|
||||
"_acme-challenge.d4science.net."
|
||||
],
|
||||
"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": [
|
||||
"openstack_dns_zone_v2.primary_project_dns_zone"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_dns_zone_v2",
|
||||
|
|
|
@ -37,10 +37,6 @@ variable "availability_zones_names" {
|
|||
}
|
||||
}
|
||||
|
||||
variable "storage_nfs_network_id" {
|
||||
default = "5f4023cc-4016-404c-94e5-86220095fbaf"
|
||||
}
|
||||
|
||||
variable "ubuntu_1804" {
|
||||
type = map(string)
|
||||
|
||||
|
|
|
@ -18,3 +18,11 @@ output "storage_nfs_network_id" {
|
|||
value = var.storage_nfs_network_id
|
||||
}
|
||||
|
||||
output "storage_nfs_subnet_id" {
|
||||
value = var.storage_nfs_subnet_id
|
||||
}
|
||||
|
||||
output "nfs_share_no_ingress_secgroup_id" {
|
||||
value = openstack_networking_secgroup_v2.nfs_share_no_ingress.id
|
||||
}
|
||||
|
||||
|
|
|
@ -43,3 +43,12 @@ variable "external_router" {
|
|||
description = ""
|
||||
}
|
||||
}
|
||||
|
||||
variable "storage_nfs_network_id" {
|
||||
default = "5f4023cc-4016-404c-94e5-86220095fbaf"
|
||||
}
|
||||
|
||||
variable "storage_nfs_subnet_id" {
|
||||
default = "6ff0f9e8-0e74-4cc3-a268-7ed4af435696"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue