From 8443fc033f7f592158d1552dc13d432b1652942b Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 11 Dec 2023 22:36:05 +0100 Subject: [PATCH] Fix the timescaledb instance names. --- .../timescaledb/terraform.tfstate | 244 +++++++++++++++++- .../modules/timescaledb/timescaledb.tf | 2 +- 2 files changed, 240 insertions(+), 6 deletions(-) diff --git a/openstack-tf/d4s-production/timescaledb/terraform.tfstate b/openstack-tf/d4s-production/timescaledb/terraform.tfstate index 57f6a126..30926ef7 100644 --- a/openstack-tf/d4s-production/timescaledb/terraform.tfstate +++ b/openstack-tf/d4s-production/timescaledb/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.5", - "serial": 8, + "serial": 14, "lineage": "8af59f4a-8f6d-ee9b-d181-ecd7b78a4e86", "outputs": {}, "resources": [ @@ -762,6 +762,237 @@ } ] }, + { + "module": "module.timescaledb", + "mode": "managed", + "type": "openstack_compute_instance_v2", + "name": "timescaledb_server", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "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" + ], + "stop_before_destroy": false, + "tags": [], + "timeouts": null, + "updated": "2023-12-11 21:34:21 +0000 UTC", + "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", + "vendor_options": [], + "volume": [] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "module.timescaledb.data.terraform_remote_state.privnet_dns_router", + "module.timescaledb.openstack_compute_servergroup_v2.timescaledb_cluster", + "module.timescaledb.openstack_networking_network_v2.timescaledb_net", + "module.timescaledb.openstack_networking_secgroup_v2.timescaledb_access", + "module.timescaledb.openstack_networking_subnet_v2.timescaledb_subnet" + ] + }, + { + "index_key": 1, + "schema_version": 0, + "attributes": { + "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" + ], + "stop_before_destroy": false, + "tags": [], + "timeouts": null, + "updated": "2023-12-11 21:34:22 +0000 UTC", + "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", + "vendor_options": [], + "volume": [] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "module.timescaledb.data.terraform_remote_state.privnet_dns_router", + "module.timescaledb.openstack_compute_servergroup_v2.timescaledb_cluster", + "module.timescaledb.openstack_networking_network_v2.timescaledb_net", + "module.timescaledb.openstack_networking_secgroup_v2.timescaledb_access", + "module.timescaledb.openstack_networking_subnet_v2.timescaledb_subnet" + ] + } + ] + }, { "module": "module.timescaledb", "mode": "managed", @@ -773,7 +1004,10 @@ "schema_version": 0, "attributes": { "id": "9795efca-fcbd-4318-b351-795b9dbb8ed6", - "members": [], + "members": [ + "90985a5c-f133-484c-9646-030da83def36", + "836d01b1-bf16-460d-a351-6e963e0d306b" + ], "name": "timescaledb_cluster", "policies": [ "soft-anti-affinity" @@ -815,7 +1049,7 @@ "region": "isti_area_pi_1", "segments": [], "shared": false, - "tags": null, + "tags": [], "tenant_id": "1b45adf388934758b56d0dfdb4bfacf3", "timeouts": null, "transparent_vlan": false, @@ -877,7 +1111,7 @@ "id": "6e10094c-86d7-449d-bcd9-e5e8dffb4504", "name": "access_to_the_timescaledb_service", "region": "isti_area_pi_1", - "tags": null, + "tags": [], "tenant_id": "1b45adf388934758b56d0dfdb4bfacf3", "timeouts": null }, @@ -930,7 +1164,7 @@ "region": "isti_area_pi_1", "service_types": [], "subnetpool_id": "", - "tags": null, + "tags": [], "tenant_id": "1b45adf388934758b56d0dfdb4bfacf3", "timeouts": null, "value_specs": null diff --git a/openstack-tf/modules/timescaledb/timescaledb.tf b/openstack-tf/modules/timescaledb/timescaledb.tf index c393db26..bf10dc07 100644 --- a/openstack-tf/modules/timescaledb/timescaledb.tf +++ b/openstack-tf/modules/timescaledb/timescaledb.tf @@ -55,7 +55,7 @@ resource "openstack_compute_servergroup_v2" "timescaledb_cluster" { # Instances with an additional block device resource "openstack_compute_instance_v2" "timescaledb_server" { count = var.timescaledb_nodes_count - name = var.timescaledb_server_data.node_name + name = format("%s-%02d", var.timescaledb_server_data.node_name, count.index+1) availability_zone_hints = module.common_variables.availability_zones_names.availability_zone_no_gpu image_name = module.common_variables.ubuntu_2204.name flavor_name = var.timescaledb_node_flavor