From 592d81175413a6e2c8e700854583c39b669843a8 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 22 Jan 2024 13:56:45 +0100 Subject: [PATCH] KDD: aggiunta informazione allo stato. --- kdd/main_net_dns_router/main.tf | 25 +- kdd/main_net_dns_router/terraform.tfstate | 279 ++++++++++++++++++++-- 2 files changed, 275 insertions(+), 29 deletions(-) diff --git a/kdd/main_net_dns_router/main.tf b/kdd/main_net_dns_router/main.tf index 7e83d7e..1607d0a 100644 --- a/kdd/main_net_dns_router/main.tf +++ b/kdd/main_net_dns_router/main.tf @@ -30,6 +30,7 @@ module "main_private_net_and_dns_zone" { name = "kdd-lab-cloud" id = "d6757d56e6e54ffe83a9701cc92af4c2" } + main_private_network = { name = "kdd-cloud-main" description = "KDD private network (use this as the main network)" @@ -85,14 +86,25 @@ output "os_project_data" { value = module.main_private_net_and_dns_zone.os_project_data } +output "dns_zone" { + value = module.main_private_net_and_dns_zone.dns_zone +} + output "dns_zone_id" { value = module.main_private_net_and_dns_zone.dns_zone_id } +output "main_private_network" { + value = module.main_private_net_and_dns_zone.main_private_network +} + output "main_private_network_id" { value = module.main_private_net_and_dns_zone.main_private_network_id } +output "main_subnet_network" { + value = module.main_private_net_and_dns_zone.main_subnet_network +} output "main_subnet_network_id" { value = module.main_private_net_and_dns_zone.main_subnet_network_id } @@ -101,8 +113,6 @@ output "external_gateway_ip" { value = module.main_private_net_and_dns_zone.external_gateway_ip } -# Module used - output "main_region" { value = module.labs_common_variables.main_region } @@ -144,10 +154,6 @@ output "ssh_sources" { value = module.labs_common_variables.ssh_sources } -output "ubuntu_1804" { - value = module.labs_common_variables.ubuntu_1804 -} - output "ubuntu_2204" { value = module.labs_common_variables.ubuntu_2204 } @@ -160,10 +166,6 @@ output "almalinux_9" { value = module.labs_common_variables.almalinux_9 } -output "ubuntu1804_data_file" { - value = module.labs_common_variables.ubuntu1804_data_file -} - output "ubuntu2204_data_file" { value = module.labs_common_variables.ubuntu2204_data_file } @@ -180,3 +182,6 @@ output "flavor_list" { value = module.labs_common_variables.flavor_list } +output "default_security_group_name" { + value = module.labs_common_variables.default_security_group_name +} diff --git a/kdd/main_net_dns_router/terraform.tfstate b/kdd/main_net_dns_router/terraform.tfstate index 8b29740..6ff065d 100644 --- a/kdd/main_net_dns_router/terraform.tfstate +++ b/kdd/main_net_dns_router/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.6", - "serial": 17, + "serial": 18, "lineage": "c6d5332e-26ca-a882-04a1-5c0d0b8e53ea", "outputs": { "almalinux_9": { @@ -35,6 +35,7 @@ "centos_7": { "value": { "name": "CentOS-7", + "user_data_file": "../../s2i2s_openstack_vm_data_scripts/el.sh", "uuid": "f0187a99-64f6-462a-ab5f-ef52fe62f2ca" }, "type": [ @@ -42,12 +43,67 @@ "string" ] }, + "default_security_group_name": { + "value": "default_for_all", + "type": "string" + }, + "dns_zone": { + "value": { + "attributes": {}, + "description": "DNS primary zone for the kdd-lab project", + "disable_status_check": false, + "email": "postmaster@isti.cnr.it", + "id": "9d29d051-9567-4af4-9ffe-87eb643fc90b", + "masters": [], + "name": "kdd.cloud.isti.cnr.it.", + "project_id": "d6757d56e6e54ffe83a9701cc92af4c2", + "region": "isti_area_pi_1", + "timeouts": null, + "ttl": 8600, + "type": "PRIMARY", + "value_specs": null + }, + "type": [ + "object", + { + "attributes": [ + "map", + "string" + ], + "description": "string", + "disable_status_check": "bool", + "email": "string", + "id": "string", + "masters": [ + "set", + "string" + ], + "name": "string", + "project_id": "string", + "region": "string", + "timeouts": [ + "object", + { + "create": "string", + "delete": "string", + "update": "string" + } + ], + "ttl": "number", + "type": "string", + "value_specs": [ + "map", + "string" + ] + } + ] + }, "dns_zone_id": { "value": "9d29d051-9567-4af4-9ffe-87eb643fc90b", "type": "string" }, "el7_data_file": { - "value": "../../openstack_vm_data_scripts/el7.sh", + "value": "../../s2i2s_openstack_vm_data_scripts/el.sh", "type": "string" }, "external_gateway_ip": { @@ -111,6 +167,87 @@ "string" ] }, + "main_private_network": { + "value": { + "admin_state_up": true, + "all_tags": [], + "availability_zone_hints": [], + "description": "KDD private network (use this as the main network)", + "dns_domain": "kdd.cloud.isti.cnr.it.", + "external": false, + "id": "fb006673-39b6-472b-ba20-f1087e7e38ef", + "mtu": 8942, + "name": "kdd-cloud-main", + "port_security_enabled": true, + "qos_policy_id": "", + "region": "isti_area_pi_1", + "segments": [ + { + "network_type": "geneve", + "physical_network": "", + "segmentation_id": 6061 + } + ], + "shared": false, + "tags": [], + "tenant_id": "d6757d56e6e54ffe83a9701cc92af4c2", + "timeouts": null, + "transparent_vlan": false, + "value_specs": null + }, + "type": [ + "object", + { + "admin_state_up": "bool", + "all_tags": [ + "set", + "string" + ], + "availability_zone_hints": [ + "set", + "string" + ], + "description": "string", + "dns_domain": "string", + "external": "bool", + "id": "string", + "mtu": "number", + "name": "string", + "port_security_enabled": "bool", + "qos_policy_id": "string", + "region": "string", + "segments": [ + "set", + [ + "object", + { + "network_type": "string", + "physical_network": "string", + "segmentation_id": "number" + } + ] + ], + "shared": "bool", + "tags": [ + "set", + "string" + ], + "tenant_id": "string", + "timeouts": [ + "object", + { + "create": "string", + "delete": "string" + } + ], + "transparent_vlan": "bool", + "value_specs": [ + "map", + "string" + ] + } + ] + }, "main_private_network_id": { "value": "fb006673-39b6-472b-ba20-f1087e7e38ef", "type": "string" @@ -119,6 +256,125 @@ "value": "isti_area_pi_1", "type": "string" }, + "main_subnet_network": { + "value": { + "all_tags": [], + "allocation_pool": [ + { + "end": "10.12.7.254", + "start": "10.12.1.1" + } + ], + "allocation_pools": [ + { + "end": "10.12.7.254", + "start": "10.12.1.1" + } + ], + "cidr": "10.12.0.0/21", + "description": "kdd main private subnet", + "dns_nameservers": [ + "146.48.29.97", + "146.48.29.98", + "146.48.29.99" + ], + "enable_dhcp": true, + "gateway_ip": "10.12.0.1", + "host_routes": [], + "id": "ddf59a67-2bbc-4678-a1ae-19ef01a295e2", + "ip_version": 4, + "ipv6_address_mode": "", + "ipv6_ra_mode": "", + "name": "kdd-cloud-main-subnet", + "network_id": "fb006673-39b6-472b-ba20-f1087e7e38ef", + "no_gateway": false, + "prefix_length": null, + "region": "isti_area_pi_1", + "service_types": [], + "subnetpool_id": "", + "tags": [], + "tenant_id": "d6757d56e6e54ffe83a9701cc92af4c2", + "timeouts": null, + "value_specs": null + }, + "type": [ + "object", + { + "all_tags": [ + "set", + "string" + ], + "allocation_pool": [ + "set", + [ + "object", + { + "end": "string", + "start": "string" + } + ] + ], + "allocation_pools": [ + "list", + [ + "object", + { + "end": "string", + "start": "string" + } + ] + ], + "cidr": "string", + "description": "string", + "dns_nameservers": [ + "list", + "string" + ], + "enable_dhcp": "bool", + "gateway_ip": "string", + "host_routes": [ + "list", + [ + "object", + { + "destination_cidr": "string", + "next_hop": "string" + } + ] + ], + "id": "string", + "ip_version": "number", + "ipv6_address_mode": "string", + "ipv6_ra_mode": "string", + "name": "string", + "network_id": "string", + "no_gateway": "bool", + "prefix_length": "number", + "region": "string", + "service_types": [ + "list", + "string" + ], + "subnetpool_id": "string", + "tags": [ + "set", + "string" + ], + "tenant_id": "string", + "timeouts": [ + "object", + { + "create": "string", + "delete": "string" + } + ], + "value_specs": [ + "map", + "string" + ] + } + ] + }, "main_subnet_network_id": { "value": "ddf59a67-2bbc-4678-a1ae-19ef01a295e2", "type": "string" @@ -176,29 +432,14 @@ "string" ] }, - "ubuntu1804_data_file": { - "value": "../../openstack_vm_data_scripts/ubuntu1804.sh", - "type": "string" - }, "ubuntu2204_data_file": { - "value": "../../openstack_vm_data_scripts/ubuntu2204.sh", + "value": "../../s2i2s_openstack_vm_data_scripts/ubuntu2204.sh", "type": "string" }, - "ubuntu_1804": { - "value": { - "name": "Ubuntu-Bionic-18.04", - "user_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", - "uuid": "7ed6a2cd-2b07-482e-8ce4-f018dff16c89" - }, - "type": [ - "map", - "string" - ] - }, "ubuntu_2204": { "value": { "name": "Ubuntu-Jammy-22.04", - "user_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", + "user_data_file": "../../s2i2s_openstack_vm_data_scripts/ubuntu2204.sh", "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627" }, "type": [