mauro.mugnaini
/
infrastructure-as-code
forked from InfraScience/infrastructure-as-code
1
0
Fork 0
Code Pull Requests Activity

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
Conversation 0 Commits 104 Files Changed 152 +27 -6
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 134035acd0 - Show all commits

8
openstack-tf/d4s-dev/project-setup/terraform.tfstate
View File

@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.6.6", "terraform_version": "1.6.6",
"serial": 11, "serial": 12,
"lineage": "194691ec-f344-4bd2-98ae-cbd15e9c9cdf", "lineage": "194691ec-f344-4bd2-98ae-cbd15e9c9cdf",
"outputs": { "outputs": {
"almalinux_9": { "almalinux_9": {
@ -403,6 +403,10 @@
"string" "string"
] ]
}, },
"storage_nfs_network_id": {
"value": "5f4023cc-4016-404c-94e5-86220095fbaf",
"type": "string"
},
"ubuntu1804_data_file": { "ubuntu1804_data_file": {
"value": "../../openstack_vm_data_scripts/ubuntu1804.sh", "value": "../../openstack_vm_data_scripts/ubuntu1804.sh",
"type": "string" "type": "string"
@ -644,7 +648,7 @@
"id": "5887da8d-e362-4509-93ac-8a70bf8baef9", "id": "5887da8d-e362-4509-93ac-8a70bf8baef9",
"name": "nfs_share_no_ingress", "name": "nfs_share_no_ingress",
"region": "isti_area_pi_1", "region": "isti_area_pi_1",
"tags": null, "tags": [],
"tenant_id": "e8f8ca72f30648a8b389b4e745ac83a9", "tenant_id": "e8f8ca72f30648a8b389b4e745ac83a9",
"timeouts": null "timeouts": null
}, },

8
openstack-tf/d4s-preprod/project-setup/terraform.tfstate
View File

@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.6.6", "terraform_version": "1.6.6",
"serial": 37, "serial": 38,
"lineage": "6d43430c-e6aa-d370-b6d5-22f2281117df", "lineage": "6d43430c-e6aa-d370-b6d5-22f2281117df",
"outputs": { "outputs": {
"almalinux_9": { "almalinux_9": {
@ -407,6 +407,10 @@
"string" "string"
] ]
}, },
"storage_nfs_network_id": {
"value": "5f4023cc-4016-404c-94e5-86220095fbaf",
"type": "string"
},
"ubuntu1804_data_file": { "ubuntu1804_data_file": {
"value": "../../openstack_vm_data_scripts/ubuntu1804.sh", "value": "../../openstack_vm_data_scripts/ubuntu1804.sh",
"type": "string" "type": "string"
@ -648,7 +652,7 @@
"id": "ddb16502-7217-4677-a8a7-ca0cbf9a779a", "id": "ddb16502-7217-4677-a8a7-ca0cbf9a779a",
"name": "nfs_share_no_ingress", "name": "nfs_share_no_ingress",
"region": "isti_area_pi_1", "region": "isti_area_pi_1",
"tags": null, "tags": [],
"tenant_id": "6fdc02e2827b405dad99f34698659742", "tenant_id": "6fdc02e2827b405dad99f34698659742",
"timeouts": null "timeouts": null
}, },

8
openstack-tf/d4s-production/project-setup/terraform.tfstate
View File

@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.6.6", "terraform_version": "1.6.6",
"serial": 17, "serial": 19,
"lineage": "6d54ddff-c4ea-b8c7-3b92-53ed6c62db24", "lineage": "6d54ddff-c4ea-b8c7-3b92-53ed6c62db24",
"outputs": { "outputs": {
"almalinux_9": { "almalinux_9": {
@ -404,6 +404,10 @@
"string" "string"
] ]
}, },
"storage_nfs_network_id": {
"value": "5f4023cc-4016-404c-94e5-86220095fbaf",
"type": "string"
},
"ubuntu1804_data_file": { "ubuntu1804_data_file": {
"value": "../../openstack_vm_data_scripts/ubuntu1804.sh", "value": "../../openstack_vm_data_scripts/ubuntu1804.sh",
"type": "string" "type": "string"
@ -613,7 +617,7 @@
"id": "167e4897-f776-4cbd-986f-77313aa68af2", "id": "167e4897-f776-4cbd-986f-77313aa68af2",
"name": "nfs_share_no_ingress", "name": "nfs_share_no_ingress",
"region": "isti_area_pi_1", "region": "isti_area_pi_1",
"tags": null, "tags": [],
"tenant_id": "1b45adf388934758b56d0dfdb4bfacf3", "tenant_id": "1b45adf388934758b56d0dfdb4bfacf3",
"timeouts": null "timeouts": null
}, },

4
openstack-tf/modules/common_variables/variables.tf
View File

@ -37,6 +37,10 @@ variable "availability_zones_names" {
} }
} }
variable "storage_nfs_network_id" {
default = "5f4023cc-4016-404c-94e5-86220095fbaf"
}
variable "ubuntu_1804" { variable "ubuntu_1804" {
type = map(string) type = map(string)

5
openstack-tf/modules/main_private_net_and_dns_zone/outputs.tf
View File

@ -13,3 +13,8 @@ output "main_subnet_network_id" {
output "external_gateway_ip" { output "external_gateway_ip" {
value = openstack_networking_router_v2.external-router.external_fixed_ip value = openstack_networking_router_v2.external-router.external_fixed_ip
} }
output "storage_nfs_network_id" {
value = var.storage_nfs_network_id
}