From e7ec7726c8e4edde4bd6847912c9f8256c97ba7e Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Tue, 5 Mar 2024 19:11:37 +0100 Subject: [PATCH] Add outputs to timescaledb in production. --- .../d4s-production/timescaledb/outputs.tf | 12 + .../timescaledb/terraform.tfstate | 765 +++++++++++++++++- 2 files changed, 760 insertions(+), 17 deletions(-) create mode 100644 openstack-tf/d4s-production/timescaledb/outputs.tf diff --git a/openstack-tf/d4s-production/timescaledb/outputs.tf b/openstack-tf/d4s-production/timescaledb/outputs.tf new file mode 100644 index 0000000..141add5 --- /dev/null +++ b/openstack-tf/d4s-production/timescaledb/outputs.tf @@ -0,0 +1,12 @@ +output "timescaledb_net" { + value = module.timescaledb.timescaledb_net +} + +output "timescaledb_subnet" { + value = module.timescaledb.timescaledb_subnet +} + +output "timescaledb_servers" { + value = module.timescaledb.timescaledb_servers + sensitive = true +} diff --git a/openstack-tf/d4s-production/timescaledb/terraform.tfstate b/openstack-tf/d4s-production/timescaledb/terraform.tfstate index 30926ef..6c8f32b 100644 --- a/openstack-tf/d4s-production/timescaledb/terraform.tfstate +++ b/openstack-tf/d4s-production/timescaledb/terraform.tfstate @@ -1,9 +1,716 @@ { "version": 4, - "terraform_version": "1.6.5", - "serial": 14, + "terraform_version": "1.6.6", + "serial": 16, "lineage": "8af59f4a-8f6d-ee9b-d181-ecd7b78a4e86", - "outputs": {}, + "outputs": { + "timescaledb_net": { + "value": { + "admin_state_up": true, + "all_tags": [], + "availability_zone_hints": [], + "description": "Network used by the Timescaledb cluster and to access the service", + "dns_domain": "cloud.d4science.org.", + "external": false, + "id": "3b0e4c3c-3a1c-4f14-abd1-03f8c8495daf", + "mtu": 8942, + "name": "timescaledb-net", + "port_security_enabled": true, + "qos_policy_id": "", + "region": "isti_area_pi_1", + "segments": [], + "shared": false, + "tags": [], + "tenant_id": "1b45adf388934758b56d0dfdb4bfacf3", + "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" + ] + } + ] + }, + "timescaledb_servers": { + "value": [ + { + "access_ip_v4": "10.1.41.119", + "access_ip_v6": "", + "admin_pass": null, + "all_metadata": {}, + "all_tags": [], + "availability_zone": "cnr-isti-nova-a", + "availability_zone_hints": "cnr-isti-nova-a", + "block_device": [ + { + "boot_index": 0, + "delete_on_termination": false, + "destination_type": "volume", + "device_type": "", + "disk_bus": "", + "guest_format": "", + "multiattach": false, + "source_type": "image", + "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627", + "volume_size": 10, + "volume_type": "" + }, + { + "boot_index": -1, + "delete_on_termination": false, + "destination_type": "volume", + "device_type": "", + "disk_bus": "", + "guest_format": "", + "multiattach": false, + "source_type": "blank", + "uuid": "", + "volume_size": 30, + "volume_type": "" + } + ], + "config_drive": null, + "created": "2023-12-11 21:30:27 +0000 UTC", + "flavor_id": "9", + "flavor_name": "m1.large", + "floating_ip": null, + "force_delete": false, + "id": "836d01b1-bf16-460d-a351-6e963e0d306b", + "image_id": "Attempt to boot from volume - no image supplied", + "image_name": "Ubuntu-Jammy-22.04", + "key_pair": "adellam", + "metadata": null, + "name": "timescaledb-01", + "network": [ + { + "access_network": false, + "fixed_ip_v4": "10.1.41.119", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:8d:52:e6", + "name": "d4s-production-cloud-main", + "port": "", + "uuid": "020df98d-ae72-452a-b376-3b6dc289acac" + }, + { + "access_network": false, + "fixed_ip_v4": "192.168.11.5", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:0f:ee:7b", + "name": "timescaledb-net", + "port": "", + "uuid": "3b0e4c3c-3a1c-4f14-abd1-03f8c8495daf" + } + ], + "network_mode": null, + "personality": [], + "power_state": "active", + "region": "isti_area_pi_1", + "scheduler_hints": [ + { + "additional_properties": {}, + "build_near_host_ip": "", + "different_cell": [], + "different_host": [], + "group": "9795efca-fcbd-4318-b351-795b9dbb8ed6", + "query": [], + "same_host": [], + "target_cell": "" + } + ], + "security_groups": [ + "access_to_the_timescaledb_service", + "default_for_all", + "timescaledb_temporary" + ], + "stop_before_destroy": false, + "tags": [], + "timeouts": null, + "updated": "2024-02-12 12:49:45 +0000 UTC", + "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", + "vendor_options": [], + "volume": [] + }, + { + "access_ip_v4": "10.1.42.158", + "access_ip_v6": "", + "admin_pass": null, + "all_metadata": {}, + "all_tags": [], + "availability_zone": "cnr-isti-nova-a", + "availability_zone_hints": "cnr-isti-nova-a", + "block_device": [ + { + "boot_index": 0, + "delete_on_termination": false, + "destination_type": "volume", + "device_type": "", + "disk_bus": "", + "guest_format": "", + "multiattach": false, + "source_type": "image", + "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627", + "volume_size": 10, + "volume_type": "" + }, + { + "boot_index": -1, + "delete_on_termination": false, + "destination_type": "volume", + "device_type": "", + "disk_bus": "", + "guest_format": "", + "multiattach": false, + "source_type": "blank", + "uuid": "", + "volume_size": 30, + "volume_type": "" + } + ], + "config_drive": null, + "created": "2023-12-11 21:30:27 +0000 UTC", + "flavor_id": "9", + "flavor_name": "m1.large", + "floating_ip": null, + "force_delete": false, + "id": "90985a5c-f133-484c-9646-030da83def36", + "image_id": "Attempt to boot from volume - no image supplied", + "image_name": "Ubuntu-Jammy-22.04", + "key_pair": "adellam", + "metadata": null, + "name": "timescaledb-02", + "network": [ + { + "access_network": false, + "fixed_ip_v4": "10.1.42.158", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:88:b4:d9", + "name": "d4s-production-cloud-main", + "port": "", + "uuid": "020df98d-ae72-452a-b376-3b6dc289acac" + }, + { + "access_network": false, + "fixed_ip_v4": "192.168.11.6", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:14:2f:84", + "name": "timescaledb-net", + "port": "", + "uuid": "3b0e4c3c-3a1c-4f14-abd1-03f8c8495daf" + } + ], + "network_mode": null, + "personality": [], + "power_state": "active", + "region": "isti_area_pi_1", + "scheduler_hints": [ + { + "additional_properties": {}, + "build_near_host_ip": "", + "different_cell": [], + "different_host": [], + "group": "9795efca-fcbd-4318-b351-795b9dbb8ed6", + "query": [], + "same_host": [], + "target_cell": "" + } + ], + "security_groups": [ + "access_to_the_timescaledb_service", + "default_for_all", + "timescaledb_temporary" + ], + "stop_before_destroy": false, + "tags": [], + "timeouts": null, + "updated": "2023-12-11 21:34:22 +0000 UTC", + "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", + "vendor_options": [], + "volume": [] + } + ], + "type": [ + "tuple", + [ + [ + "object", + { + "access_ip_v4": "string", + "access_ip_v6": "string", + "admin_pass": "string", + "all_metadata": [ + "map", + "string" + ], + "all_tags": [ + "set", + "string" + ], + "availability_zone": "string", + "availability_zone_hints": "string", + "block_device": [ + "list", + [ + "object", + { + "boot_index": "number", + "delete_on_termination": "bool", + "destination_type": "string", + "device_type": "string", + "disk_bus": "string", + "guest_format": "string", + "multiattach": "bool", + "source_type": "string", + "uuid": "string", + "volume_size": "number", + "volume_type": "string" + } + ] + ], + "config_drive": "bool", + "created": "string", + "flavor_id": "string", + "flavor_name": "string", + "floating_ip": "string", + "force_delete": "bool", + "id": "string", + "image_id": "string", + "image_name": "string", + "key_pair": "string", + "metadata": [ + "map", + "string" + ], + "name": "string", + "network": [ + "list", + [ + "object", + { + "access_network": "bool", + "fixed_ip_v4": "string", + "fixed_ip_v6": "string", + "floating_ip": "string", + "mac": "string", + "name": "string", + "port": "string", + "uuid": "string" + } + ] + ], + "network_mode": "string", + "personality": [ + "set", + [ + "object", + { + "content": "string", + "file": "string" + } + ] + ], + "power_state": "string", + "region": "string", + "scheduler_hints": [ + "set", + [ + "object", + { + "additional_properties": [ + "map", + "string" + ], + "build_near_host_ip": "string", + "different_cell": [ + "list", + "string" + ], + "different_host": [ + "list", + "string" + ], + "group": "string", + "query": [ + "list", + "string" + ], + "same_host": [ + "list", + "string" + ], + "target_cell": "string" + } + ] + ], + "security_groups": [ + "set", + "string" + ], + "stop_before_destroy": "bool", + "tags": [ + "set", + "string" + ], + "timeouts": [ + "object", + { + "create": "string", + "delete": "string", + "update": "string" + } + ], + "updated": "string", + "user_data": "string", + "vendor_options": [ + "set", + [ + "object", + { + "detach_ports_before_destroy": "bool", + "ignore_resize_confirmation": "bool" + } + ] + ], + "volume": [ + "set", + [ + "object", + { + "device": "string", + "id": "string", + "volume_id": "string" + } + ] + ] + } + ], + [ + "object", + { + "access_ip_v4": "string", + "access_ip_v6": "string", + "admin_pass": "string", + "all_metadata": [ + "map", + "string" + ], + "all_tags": [ + "set", + "string" + ], + "availability_zone": "string", + "availability_zone_hints": "string", + "block_device": [ + "list", + [ + "object", + { + "boot_index": "number", + "delete_on_termination": "bool", + "destination_type": "string", + "device_type": "string", + "disk_bus": "string", + "guest_format": "string", + "multiattach": "bool", + "source_type": "string", + "uuid": "string", + "volume_size": "number", + "volume_type": "string" + } + ] + ], + "config_drive": "bool", + "created": "string", + "flavor_id": "string", + "flavor_name": "string", + "floating_ip": "string", + "force_delete": "bool", + "id": "string", + "image_id": "string", + "image_name": "string", + "key_pair": "string", + "metadata": [ + "map", + "string" + ], + "name": "string", + "network": [ + "list", + [ + "object", + { + "access_network": "bool", + "fixed_ip_v4": "string", + "fixed_ip_v6": "string", + "floating_ip": "string", + "mac": "string", + "name": "string", + "port": "string", + "uuid": "string" + } + ] + ], + "network_mode": "string", + "personality": [ + "set", + [ + "object", + { + "content": "string", + "file": "string" + } + ] + ], + "power_state": "string", + "region": "string", + "scheduler_hints": [ + "set", + [ + "object", + { + "additional_properties": [ + "map", + "string" + ], + "build_near_host_ip": "string", + "different_cell": [ + "list", + "string" + ], + "different_host": [ + "list", + "string" + ], + "group": "string", + "query": [ + "list", + "string" + ], + "same_host": [ + "list", + "string" + ], + "target_cell": "string" + } + ] + ], + "security_groups": [ + "set", + "string" + ], + "stop_before_destroy": "bool", + "tags": [ + "set", + "string" + ], + "timeouts": [ + "object", + { + "create": "string", + "delete": "string", + "update": "string" + } + ], + "updated": "string", + "user_data": "string", + "vendor_options": [ + "set", + [ + "object", + { + "detach_ports_before_destroy": "bool", + "ignore_resize_confirmation": "bool" + } + ] + ], + "volume": [ + "set", + [ + "object", + { + "device": "string", + "id": "string", + "volume_id": "string" + } + ] + ] + } + ] + ] + ], + "sensitive": true + }, + "timescaledb_subnet": { + "value": { + "all_tags": [], + "allocation_pool": [ + { + "end": "192.168.11.254", + "start": "192.168.11.20" + } + ], + "allocation_pools": [ + { + "end": "192.168.11.254", + "start": "192.168.11.20" + } + ], + "cidr": "192.168.11.0/24", + "description": "subnet used to connect to the shared TimeScaleDB service", + "dns_nameservers": [ + "146.48.29.97", + "146.48.29.98", + "146.48.29.99" + ], + "enable_dhcp": true, + "gateway_ip": "", + "host_routes": [], + "id": "8abd0e9b-cd7e-4c61-94e0-e283abab0a82", + "ip_version": 4, + "ipv6_address_mode": "", + "ipv6_ra_mode": "", + "name": "timescaledb-subnet", + "network_id": "3b0e4c3c-3a1c-4f14-abd1-03f8c8495daf", + "no_gateway": true, + "prefix_length": null, + "region": "isti_area_pi_1", + "service_types": [], + "subnetpool_id": "", + "tags": [], + "tenant_id": "1b45adf388934758b56d0dfdb4bfacf3", + "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" + ] + } + ] + } + }, "resources": [ { "mode": "data", @@ -86,12 +793,15 @@ "c1_large": "c1.large", "c1_medium": "c1.medium", "c1_small": "c1.small", + "c2_large": "c2.large", "m1_large": "m1.large", "m1_medium": "m1.medium", "m1_xlarge": "m1.xlarge", + "m1_xxl": "m1.xxl", "m2_large": "m2.large", "m2_medium": "m2.medium", - "m2_small": "m2.small" + "m2_small": "m2.small", + "m3_large": "m3.large" }, "floating_ip_pools": { "main_public_ip_pool": "external-network" @@ -128,6 +838,7 @@ "main_subnet_network_id": "5d7b83ad-e058-4a3a-bfd8-d20ba6d42e1a", "mtu_size": 8942, "networks_list": { + "cassandra": "cassandra-net", "orientdb": "orientdb-net", "orientdb_se": "orientdb-se-net", "shared_postgresql": "postgresql-srv-net", @@ -142,6 +853,7 @@ "isti_net": "146.48.80.0/21", "s2i2s_net": "146.48.28.0/22" }, + "nfs_share_no_ingress_secgroup_id": "167e4897-f776-4cbd-986f-77313aa68af2", "octavia_information": { "main_lb_description": "Main L4 load balancer for the D4Science production", "main_lb_hostname": "main-lb", @@ -162,7 +874,7 @@ "prometheus_server_data": { "flavor": "m1.medium", "name": "prometheus", - "public_grafana_server_cidr": "146.48.122.132/32", + "public_grafana_server_cidr": "146.48.28.103/32", "vol_data_device": "/dev/vdb", "vol_data_name": "prometheus-data", "vol_data_size": "100" @@ -184,11 +896,12 @@ "default": "default", "docker_swarm": "Docker Swarm", "docker_swarm_NFS": "Docker Swarm NFS", - "haproxy": "HAPROXY L7", - "http_and_https_from_the_load_balancers": "http and https from the load balancers", - "limited_HTTPS_access": "Limited HTTPS access", + "haproxy": "traffic_from_main_lb_to_haproxy_l7", + "http_and_https_from_the_load_balancers": "traffic_from_the_main_load_balancers", + "limited_HTTPS_access": "restricted_web_service", "limited_SSH_access": "Limited SSH access", "mongo": "mongo", + "nfs_share_no_ingress": "nfs_share_no_ingress", "orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic", "postgreSQL": "PostgreSQL service", "public_HTTPS": "Public HTTPS" @@ -220,6 +933,8 @@ "s2i2s_vpn_2_cidr": "146.48.28.11/32", "shell_d4s_cidr": "146.48.122.95/32" }, + "storage_nfs_network_id": "5f4023cc-4016-404c-94e5-86220095fbaf", + "storage_nfs_subnet_id": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696", "ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", "ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", "ubuntu_1804": { @@ -320,6 +1035,7 @@ "map", "string" ], + "nfs_share_no_ingress_secgroup_id": "string", "octavia_information": [ "map", "string" @@ -364,6 +1080,8 @@ "map", "string" ], + "storage_nfs_network_id": "string", + "storage_nfs_subnet_id": "string", "ubuntu1804_data_file": "string", "ubuntu2204_data_file": "string", "ubuntu_1804": [ @@ -465,12 +1183,15 @@ "c1_large": "c1.large", "c1_medium": "c1.medium", "c1_small": "c1.small", + "c2_large": "c2.large", "m1_large": "m1.large", "m1_medium": "m1.medium", "m1_xlarge": "m1.xlarge", + "m1_xxl": "m1.xxl", "m2_large": "m2.large", "m2_medium": "m2.medium", - "m2_small": "m2.small" + "m2_small": "m2.small", + "m3_large": "m3.large" }, "floating_ip_pools": { "main_public_ip_pool": "external-network" @@ -507,6 +1228,7 @@ "main_subnet_network_id": "5d7b83ad-e058-4a3a-bfd8-d20ba6d42e1a", "mtu_size": 8942, "networks_list": { + "cassandra": "cassandra-net", "orientdb": "orientdb-net", "orientdb_se": "orientdb-se-net", "shared_postgresql": "postgresql-srv-net", @@ -521,6 +1243,7 @@ "isti_net": "146.48.80.0/21", "s2i2s_net": "146.48.28.0/22" }, + "nfs_share_no_ingress_secgroup_id": "167e4897-f776-4cbd-986f-77313aa68af2", "octavia_information": { "main_lb_description": "Main L4 load balancer for the D4Science production", "main_lb_hostname": "main-lb", @@ -541,7 +1264,7 @@ "prometheus_server_data": { "flavor": "m1.medium", "name": "prometheus", - "public_grafana_server_cidr": "146.48.122.132/32", + "public_grafana_server_cidr": "146.48.28.103/32", "vol_data_device": "/dev/vdb", "vol_data_name": "prometheus-data", "vol_data_size": "100" @@ -563,11 +1286,12 @@ "default": "default", "docker_swarm": "Docker Swarm", "docker_swarm_NFS": "Docker Swarm NFS", - "haproxy": "HAPROXY L7", - "http_and_https_from_the_load_balancers": "http and https from the load balancers", - "limited_HTTPS_access": "Limited HTTPS access", + "haproxy": "traffic_from_main_lb_to_haproxy_l7", + "http_and_https_from_the_load_balancers": "traffic_from_the_main_load_balancers", + "limited_HTTPS_access": "restricted_web_service", "limited_SSH_access": "Limited SSH access", "mongo": "mongo", + "nfs_share_no_ingress": "nfs_share_no_ingress", "orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic", "postgreSQL": "PostgreSQL service", "public_HTTPS": "Public HTTPS" @@ -599,6 +1323,8 @@ "s2i2s_vpn_2_cidr": "146.48.28.11/32", "shell_d4s_cidr": "146.48.122.95/32" }, + "storage_nfs_network_id": "5f4023cc-4016-404c-94e5-86220095fbaf", + "storage_nfs_subnet_id": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696", "ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", "ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", "ubuntu_1804": { @@ -699,6 +1425,7 @@ "map", "string" ], + "nfs_share_no_ingress_secgroup_id": "string", "octavia_information": [ "map", "string" @@ -743,6 +1470,8 @@ "map", "string" ], + "storage_nfs_network_id": "string", + "storage_nfs_subnet_id": "string", "ubuntu1804_data_file": "string", "ubuntu2204_data_file": "string", "ubuntu_1804": [ @@ -860,12 +1589,13 @@ ], "security_groups": [ "access_to_the_timescaledb_service", - "default_for_all" + "default_for_all", + "timescaledb_temporary" ], "stop_before_destroy": false, "tags": [], "timeouts": null, - "updated": "2023-12-11 21:34:21 +0000 UTC", + "updated": "2024-02-12 12:49:45 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", "vendor_options": [], "volume": [] @@ -971,13 +1701,14 @@ ], "security_groups": [ "access_to_the_timescaledb_service", - "default_for_all" + "default_for_all", + "timescaledb_temporary" ], "stop_before_destroy": false, "tags": [], "timeouts": null, "updated": "2023-12-11 21:34:22 +0000 UTC", - "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", + "user_data": "", "vendor_options": [], "volume": [] },