diff --git a/openstack-tf/d4s-preprod/cassandra/main.tf b/openstack-tf/d4s-preprod/cassandra/main.tf index c592d75..c289df8 100644 --- a/openstack-tf/d4s-preprod/cassandra/main.tf +++ b/openstack-tf/d4s-preprod/cassandra/main.tf @@ -59,7 +59,7 @@ module "instance_without_data_volume" { port_max = 9042 }, rpc = { - description = "Cassandra TCP transport 9042", + description = "Cassandra TCP transport 9160", port_min = 9160, port_max = 9160 } diff --git a/openstack-tf/d4s-preprod/cassandra/terraform.tfstate b/openstack-tf/d4s-preprod/cassandra/terraform.tfstate index 31165a4..6507c38 100644 --- a/openstack-tf/d4s-preprod/cassandra/terraform.tfstate +++ b/openstack-tf/d4s-preprod/cassandra/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, - "terraform_version": "1.6.6", - "serial": 34, + "terraform_version": "1.9.7", + "serial": 38, "lineage": "db04bbdd-e5b8-763e-b3d3-e46d10738f42", "outputs": {}, "resources": [ @@ -132,6 +132,7 @@ "main_subnet_network_id": "cd77a2fd-4a36-4254-b1d0-70b3874c6d04", "mtu_size": 8942, "networks_list": { + "cassandra": "cassandra-net", "orientdb": "orientdb-net", "orientdb_se": "orientdb-se-net", "shared_postgresql": "postgresql-srv-net", @@ -146,6 +147,7 @@ "isti_net": "146.48.80.0/21", "s2i2s_net": "146.48.28.0/22" }, + "nfs_share_no_ingress_secgroup_id": "ddb16502-7217-4677-a8a7-ca0cbf9a779a", "octavia_information": { "main_lb_description": "Main L4 load balancer for the D4Science PRE production", "main_lb_hostname": "main-lb", @@ -168,7 +170,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" @@ -195,6 +197,7 @@ "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" @@ -226,6 +229,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": { @@ -326,6 +331,7 @@ "map", "string" ], + "nfs_share_no_ingress_secgroup_id": "string", "octavia_information": [ "map", "string" @@ -370,6 +376,8 @@ "map", "string" ], + "storage_nfs_network_id": "string", + "storage_nfs_subnet_id": "string", "ubuntu1804_data_file": "string", "ubuntu2204_data_file": "string", "ubuntu_1804": [ @@ -545,6 +553,7 @@ "main_subnet_network_id": "cd77a2fd-4a36-4254-b1d0-70b3874c6d04", "mtu_size": 8942, "networks_list": { + "cassandra": "cassandra-net", "orientdb": "orientdb-net", "orientdb_se": "orientdb-se-net", "shared_postgresql": "postgresql-srv-net", @@ -559,6 +568,7 @@ "isti_net": "146.48.80.0/21", "s2i2s_net": "146.48.28.0/22" }, + "nfs_share_no_ingress_secgroup_id": "ddb16502-7217-4677-a8a7-ca0cbf9a779a", "octavia_information": { "main_lb_description": "Main L4 load balancer for the D4Science PRE production", "main_lb_hostname": "main-lb", @@ -581,7 +591,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" @@ -608,6 +618,7 @@ "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" @@ -639,6 +650,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": { @@ -739,6 +752,7 @@ "map", "string" ], + "nfs_share_no_ingress_secgroup_id": "string", "octavia_information": [ "map", "string" @@ -783,6 +797,8 @@ "map", "string" ], + "storage_nfs_network_id": "string", + "storage_nfs_subnet_id": "string", "ubuntu1804_data_file": "string", "ubuntu2204_data_file": "string", "ubuntu_1804": [ @@ -888,7 +904,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -903,14 +919,21 @@ "default_for_all" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2024-01-17 18:39:00 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", "vendor_options": [], "volume": [] }, - "sensitive_attributes": [], + "sensitive_attributes": [ + [ + { + "type": "get_attr", + "value": "admin_pass" + } + ] + ], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ "module.instance_without_data_volume.data.terraform_remote_state.privnet_dns_router", @@ -999,7 +1022,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -1014,14 +1037,21 @@ "default_for_all" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2024-01-17 18:39:10 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", "vendor_options": [], "volume": [] }, - "sensitive_attributes": [], + "sensitive_attributes": [ + [ + { + "type": "get_attr", + "value": "admin_pass" + } + ] + ], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ "module.instance_without_data_volume.data.terraform_remote_state.privnet_dns_router", @@ -1110,7 +1140,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -1125,14 +1155,21 @@ "default_for_all" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2024-01-17 18:39:07 +0000 UTC", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", "vendor_options": [], "volume": [] }, - "sensitive_attributes": [], + "sensitive_attributes": [ + [ + { + "type": "get_attr", + "value": "admin_pass" + } + ] + ], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ "module.instance_without_data_volume.data.terraform_remote_state.privnet_dns_router", @@ -1156,8 +1193,9 @@ "attributes": { "id": "51de52be-6c6b-4727-961d-a609e3e1ba25", "members": [ - "42035e92-c138-4204-bdbe-ff1e89e1ff9d", - "ea1ce095-dd04-40e0-931e-f5a506e537e2" + "a2e6593f-3d89-4bdb-8e1f-3c7bab7b3d8a", + "d511882d-f79d-4aa3-9edb-a365b0540db0", + "7bd78dfd-ff98-446a-955c-820c8f7c1d6e" ], "name": "cassandra_cluster", "policies": [ @@ -1225,10 +1263,10 @@ "index_key": "rpc", "schema_version": 0, "attributes": { - "description": "Cassandra TCP transport 9042", + "description": "Cassandra TCP transport 9160", "direction": "ingress", "ethertype": "IPv4", - "id": "acd8be8d-b786-4bf2-9572-4ad99a0ca5b7", + "id": "f29bc2f4-6cb2-4941-947c-9bce70ffc88c", "port_range_max": 9160, "port_range_min": 9160, "protocol": "tcp", @@ -1319,6 +1357,39 @@ } ] }, + { + "module": "module.instance_without_data_volume", + "mode": "managed", + "type": "openstack_networking_secgroup_rule_v2", + "name": "cassandra_debug_from_ssh", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "description": "Cassandra debug from the ssh jump proxy", + "direction": "ingress", + "ethertype": "IPv4", + "id": "e664f16c-326f-4968-b082-803401f02ea1", + "port_range_max": 9042, + "port_range_min": 9042, + "protocol": "tcp", + "region": "isti_area_pi_1", + "remote_group_id": "", + "remote_ip_prefix": "10.1.32.5/32", + "security_group_id": "c1db941c-3d71-4c40-bd53-0059a18fe32c", + "tenant_id": "6fdc02e2827b405dad99f34698659742", + "timeouts": null + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjo2MDAwMDAwMDAwMDB9fQ==", + "dependencies": [ + "module.instance_without_data_volume.data.terraform_remote_state.privnet_dns_router", + "module.instance_without_data_volume.openstack_networking_secgroup_v2.cassandra_access" + ] + } + ] + }, { "module": "module.instance_without_data_volume", "mode": "managed",