From c412be26fc6cc15b4c605c0fcb5d67b315e5fdb6 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 11 Jan 2024 19:11:16 +0100 Subject: [PATCH] Change the grafana's IP address. --- .../basic-infrastructure/terraform.tfstate | 412 ++++++++++++++++-- .../outputs-production.tf | 1 + .../basic-infrastructure/outputs.tf | 1 + .../basic-infrastructure/terraform.tfstate | 408 ++++++++++++++++- .../modules/common_variables/variables.tf | 2 +- 5 files changed, 792 insertions(+), 32 deletions(-) create mode 120000 openstack-tf/d4s-production/basic-infrastructure/outputs-production.tf create mode 120000 openstack-tf/d4s-production/basic-infrastructure/outputs.tf diff --git a/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate b/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate index 9ccb6c1..e70827c 100644 --- a/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate +++ b/openstack-tf/d4s-preprod/basic-infrastructure/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.6", - "serial": 260, + "serial": 263, "lineage": "6a53b692-c1a8-ed53-bc6c-b7fb5e017eb8", "outputs": { "almalinux_9": { @@ -32,6 +32,26 @@ "string" ] }, + "basic_services_ip": { + "value": { + "ca": "10.1.32.4", + "ca_cidr": "10.1.32.4/32", + "haproxy_l7_1": "10.1.32.11", + "haproxy_l7_1_cidr": "10.1.32.11/32", + "haproxy_l7_2": "10.1.32.12", + "haproxy_l7_2_cidr": "10.1.32.12/32", + "octavia_main": "10.1.32.20", + "octavia_main_cidr": "10.1.32.20/32", + "prometheus": "10.1.32.10", + "prometheus_cidr": "10.1.32.10/32", + "ssh_jump": "10.1.32.5", + "ssh_jump_cidr": "10.1.32.5/32" + }, + "type": [ + "map", + "string" + ] + }, "centos_7": { "value": { "name": "CentOS-7", @@ -42,6 +62,23 @@ "string" ] }, + "default_security_group_name": { + "value": "default_for_all", + "type": "string" + }, + "dns_zone": { + "value": { + "description": "DNS primary zone for the d4s-pre-cloud project", + "email": "postmaster@isti.cnr.it", + "id": "c1a4b4bc-f167-4387-855d-38f0f99ca05c", + "ttl": "8600", + "zone_name": "cloud-pre.d4science.org." + }, + "type": [ + "map", + "string" + ] + }, "el7_data_file": { "value": "../../openstack_vm_data_scripts/el7.sh", "type": "string" @@ -60,6 +97,17 @@ "value": "1d2ff137-6ff7-4017-be2b-0d6c4af2353b", "type": "string" }, + "external_router": { + "value": { + "description": "D4Science Preprod main router", + "id": "cc26064a-bb08-4c0b-929f-d0cb39f934a3", + "name": "d4s-pre-cloud-external-router" + }, + "type": [ + "map", + "string" + ] + }, "flavor_list": { "value": { "c1_large": "c1.large", @@ -126,6 +174,30 @@ "value": "10.1.32.20", "type": "string" }, + "main_private_network": { + "value": { + "description": "D4Science Preprod private network (use this as the main network)", + "name": "d4s-pre-cloud-main" + }, + "type": [ + "map", + "string" + ] + }, + "main_private_subnet": { + "value": { + "allocation_end": "10.1.35.254", + "allocation_start": "10.1.32.100", + "cidr": "10.1.32.0/22", + "description": "D4Science Preprod main private subnet", + "gateway_ip": "10.1.32.1", + "name": "d4s-pre-cloud-main-subnet" + }, + "type": [ + "map", + "string" + ] + }, "main_region": { "value": "isti_area_pi_1", "type": "string" @@ -161,6 +233,22 @@ "string" ] }, + "octavia_information": { + "value": { + "main_lb_description": "Main L4 load balancer for the D4Science PRE production", + "main_lb_hostname": "main-lb", + "main_lb_name": "d4s-pre-cloud-l4-load-balancer", + "octavia_flavor": "octavia_amphora-mvcpu-ha", + "octavia_flavor_id": "394988b5-6603-4a1e-a939-8e177c6681c7", + "octavia_vrrp_ip_1": "10.1.33.159/32", + "octavia_vrrp_ip_2": "10.1.32.199/32", + "swarm_lb_name": "d4s-pre-cloud-l4-swarm-load-balancer" + }, + "type": [ + "map", + "string" + ] + }, "os_project_data": { "value": { "id": "6fdc02e2827b405dad99f34698659742" @@ -186,7 +274,7 @@ "value": { "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" @@ -347,31 +435,196 @@ "defaults": null, "outputs": { "value": { - "almalinux9_img": { + "almalinux_9": { "name": "AlmaLinux-9.0-20220718", "uuid": "541650fc-dd19-4f38-bb1d-7333ed9dd688" }, "availability_zone_no_gpu_name": "cnr-isti-nova-a", "availability_zone_with_gpu_name": "cnr-isti-nova-gpu-a", - "centos7_img": { + "availability_zones_names": { + "availability_zone_no_gpu": "cnr-isti-nova-a", + "availability_zone_with_gpu": "cnr-isti-nova-gpu-a" + }, + "basic_services_ip": { + "ca": "10.1.32.4", + "ca_cidr": "10.1.32.4/32", + "haproxy_l7_1": "10.1.32.11", + "haproxy_l7_1_cidr": "10.1.32.11/32", + "haproxy_l7_2": "10.1.32.12", + "haproxy_l7_2_cidr": "10.1.32.12/32", + "octavia_main": "10.1.32.20", + "octavia_main_cidr": "10.1.32.20/32", + "prometheus": "10.1.32.10", + "prometheus_cidr": "10.1.32.10/32", + "ssh_jump": "10.1.32.5", + "ssh_jump_cidr": "10.1.32.5/32" + }, + "centos_7": { "name": "CentOS-7", "uuid": "f0187a99-64f6-462a-ab5f-ef52fe62f2ca" }, + "default_security_group_name": "default_for_all", + "dns_zone": { + "description": "DNS primary zone for the d4s-pre-cloud project", + "email": "postmaster@isti.cnr.it", + "id": "c1a4b4bc-f167-4387-855d-38f0f99ca05c", + "ttl": "8600", + "zone_name": "cloud-pre.d4science.org." + }, "dns_zone_id": "c1a4b4bc-f167-4387-855d-38f0f99ca05c", - "el7_datafile": "../../openstack_vm_data_scripts/el7.sh", - "external_gateway_ip": "146.48.30.241", + "el7_data_file": "../../openstack_vm_data_scripts/el7.sh", + "external_gateway_ip": [ + { + "ip_address": "146.48.30.241", + "subnet_id": "57f87509-4016-46fb-b8c3-25fca7f72ccb" + } + ], + "external_network": { + "id": "1d2ff137-6ff7-4017-be2b-0d6c4af2353b", + "name": "external-network" + }, "external_network_id": "1d2ff137-6ff7-4017-be2b-0d6c4af2353b", - "external_network_name": "external-network", + "external_router": { + "description": "D4Science Preprod main router", + "id": "cc26064a-bb08-4c0b-929f-d0cb39f934a3", + "name": "d4s-pre-cloud-external-router" + }, + "flavor_list": { + "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", + "m3_large": "m3.large" + }, + "floating_ip_pools": { + "main_public_ip_pool": "external-network" + }, + "haproxy_l7_data": { + "flavor": "m1.medium", + "haproxy_1": "haproxy-l7-1", + "haproxy_2": "haproxy-l7-2", + "name": "main-haproxy-l7", + "vm_count": "2" + }, + "internal_ca_data": { + "flavor": "m1.small", + "name": "ca" + }, + "main_haproxy_l7_ip": [ + "10.1.32.11", + "10.1.32.12" + ], + "main_private_network": { + "description": "D4Science Preprod private network (use this as the main network)", + "name": "d4s-pre-cloud-main" + }, "main_private_network_id": "23fd8a99-d551-4ada-8d3a-9859542ebb8c", - "main_region_name": "isti_area_pi_1", + "main_private_subnet": { + "allocation_end": "10.1.35.254", + "allocation_start": "10.1.32.100", + "cidr": "10.1.32.0/22", + "description": "D4Science Preprod main private subnet", + "gateway_ip": "10.1.32.1", + "name": "d4s-pre-cloud-main-subnet" + }, + "main_region": "isti_area_pi_1", "main_subnet_network_id": "cd77a2fd-4a36-4254-b1d0-70b3874c6d04", - "mtu_size_value": 8942, + "mtu_size": 8942, + "networks_list": { + "orientdb": "orientdb-net", + "orientdb_se": "orientdb-se-net", + "shared_postgresql": "postgresql-srv-net", + "swarm": "swarm-nfs-net", + "timescaledb": "timescaledb-net" + }, + "networks_with_d4s_services": { + "garr_ct1_net": "90.147.166.0/23", + "garr_na_net": "90.147.152.0/24", + "garr_pa1_net": "90.147.188.0/23", + "infrascience_net": "146.48.122.0/23", + "isti_net": "146.48.80.0/21", + "s2i2s_net": "146.48.28.0/22" + }, + "octavia_information": { + "main_lb_description": "Main L4 load balancer for the D4Science PRE production", + "main_lb_hostname": "main-lb", + "main_lb_name": "d4s-pre-cloud-l4-load-balancer", + "octavia_flavor": "octavia_amphora-mvcpu-ha", + "octavia_flavor_id": "394988b5-6603-4a1e-a939-8e177c6681c7", + "octavia_vrrp_ip_1": "10.1.33.159/32", + "octavia_vrrp_ip_2": "10.1.32.199/32", + "swarm_lb_name": "d4s-pre-cloud-l4-swarm-load-balancer" + }, + "os_project_data": { + "id": "6fdc02e2827b405dad99f34698659742" + }, + "policy_list": { + "affinity": "affinity", + "anti_affinity": "anti-affinity", + "soft_affinity": "soft-affinity", + "soft_anti_affinity": "soft-anti-affinity" + }, + "prometheus_server_data": { + "flavor": "m1.medium", + "name": "prometheus", + "public_grafana_server_cidr": "146.48.122.132/32", + "vol_data_device": "/dev/vdb", + "vol_data_name": "prometheus-data", + "vol_data_size": "100" + }, "resolvers_ip": [ "146.48.29.97", "146.48.29.98", "146.48.29.99" ], - "ssh_sources_list": { + "resource_registry_addresses": {}, + "security_group_list": { + "acaland": "acaland's dev machine", + "access_to_orientdb": "access_to_orientdb", + "access_to_orientdb_se": "access_to_orientdb_se", + "access_to_the_timescaledb_service": "access_to_the_timescaledb_service", + "cassandra": "Cassandra", + "dataminer-publish": "dataminer-publish", + "debugging_from_jump_node": "debugging_from_jump_node", + "default": "default", + "docker_swarm": "Docker Swarm", + "docker_swarm_NFS": "Docker Swarm NFS", + "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", + "orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic", + "postgreSQL": "PostgreSQL service", + "public_HTTPS": "Public HTTPS" + }, + "shared_postgresql_server_data": { + "allocation_pool_end": "192.168.3.254", + "allocation_pool_start": "192.168.0.100", + "flavor": "m1.medium", + "name": "shared-postgresql-server", + "network_cidr": "192.168.0.0/22", + "network_description": "Network used to communicate with the shared postgresql service", + "network_name": "postgresql-srv-net", + "server_cidr": "192.168.0.5/22", + "server_ip": "192.168.0.5", + "vol_data_device": "/dev/vdb", + "vol_data_name": "shared-postgresql-data", + "vol_data_size": "100" + }, + "smartexecutor_addresses": {}, + "ssh_jump_proxy": { + "flavor": "m2.small", + "name": "ssh-jump-proxy" + }, + "ssh_sources": { "d4s_vpn_1_cidr": "146.48.122.27/32", "d4s_vpn_2_cidr": "146.48.122.49/32", "infrascience_net_cidr": "146.48.122.0/23", @@ -379,54 +632,157 @@ "s2i2s_vpn_2_cidr": "146.48.28.11/32", "shell_d4s_cidr": "146.48.122.95/32" }, - "ubuntu1804_datafile": "../../openstack_vm_data_scripts/ubuntu1804.sh", - "ubuntu1804_img": { + "ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", + "ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", + "ubuntu_1804": { "name": "Ubuntu-Bionic-18.04", + "user_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", "uuid": "7ed6a2cd-2b07-482e-8ce4-f018dff16c89" }, - "ubuntu2204_datafile": "../../openstack_vm_data_scripts/ubuntu2204.sh", - "ubuntu2204_img": { + "ubuntu_2204": { "name": "Ubuntu-Jammy-22.04", + "user_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627" } }, "type": [ "object", { - "almalinux9_img": [ + "almalinux_9": [ "map", "string" ], "availability_zone_no_gpu_name": "string", "availability_zone_with_gpu_name": "string", - "centos7_img": [ + "availability_zones_names": [ + "map", + "string" + ], + "basic_services_ip": [ + "map", + "string" + ], + "centos_7": [ + "map", + "string" + ], + "default_security_group_name": "string", + "dns_zone": [ "map", "string" ], "dns_zone_id": "string", - "el7_datafile": "string", - "external_gateway_ip": "string", + "el7_data_file": "string", + "external_gateway_ip": [ + "list", + [ + "object", + { + "ip_address": "string", + "subnet_id": "string" + } + ] + ], + "external_network": [ + "map", + "string" + ], "external_network_id": "string", - "external_network_name": "string", + "external_router": [ + "map", + "string" + ], + "flavor_list": [ + "map", + "string" + ], + "floating_ip_pools": [ + "map", + "string" + ], + "haproxy_l7_data": [ + "map", + "string" + ], + "internal_ca_data": [ + "map", + "string" + ], + "main_haproxy_l7_ip": [ + "list", + "string" + ], + "main_private_network": [ + "map", + "string" + ], "main_private_network_id": "string", - "main_region_name": "string", + "main_private_subnet": [ + "map", + "string" + ], + "main_region": "string", "main_subnet_network_id": "string", - "mtu_size_value": "number", + "mtu_size": "number", + "networks_list": [ + "map", + "string" + ], + "networks_with_d4s_services": [ + "map", + "string" + ], + "octavia_information": [ + "map", + "string" + ], + "os_project_data": [ + "map", + "string" + ], + "policy_list": [ + "map", + "string" + ], + "prometheus_server_data": [ + "map", + "string" + ], "resolvers_ip": [ "list", "string" ], - "ssh_sources_list": [ + "resource_registry_addresses": [ "map", "string" ], - "ubuntu1804_datafile": "string", - "ubuntu1804_img": [ + "security_group_list": [ "map", "string" ], - "ubuntu2204_datafile": "string", - "ubuntu2204_img": [ + "shared_postgresql_server_data": [ + "map", + "string" + ], + "smartexecutor_addresses": [ + "map", + "string" + ], + "ssh_jump_proxy": [ + "map", + "string" + ], + "ssh_sources": [ + "map", + "string" + ], + "ubuntu1804_data_file": "string", + "ubuntu2204_data_file": "string", + "ubuntu_1804": [ + "map", + "string" + ], + "ubuntu_2204": [ "map", "string" ] @@ -2003,13 +2359,13 @@ "description": "Allow HTTPS from grafana.d4science.org", "direction": "ingress", "ethertype": "IPv4", - "id": "b4335816-fd94-4107-9cdd-e97fd5f8dab5", + "id": "4a081ab2-579d-4cb0-b16d-cfb51f26aef4", "port_range_max": 443, "port_range_min": 443, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "146.48.122.132/32", + "remote_ip_prefix": "146.48.28.103/32", "security_group_id": "1a3161d4-00b1-411e-a3a6-5d3f1ec06483", "tenant_id": "6fdc02e2827b405dad99f34698659742", "timeouts": null diff --git a/openstack-tf/d4s-production/basic-infrastructure/outputs-production.tf b/openstack-tf/d4s-production/basic-infrastructure/outputs-production.tf new file mode 120000 index 0000000..5d70f9b --- /dev/null +++ b/openstack-tf/d4s-production/basic-infrastructure/outputs-production.tf @@ -0,0 +1 @@ +../variables/outputs-production.tf \ No newline at end of file diff --git a/openstack-tf/d4s-production/basic-infrastructure/outputs.tf b/openstack-tf/d4s-production/basic-infrastructure/outputs.tf new file mode 120000 index 0000000..5c8e7fb --- /dev/null +++ b/openstack-tf/d4s-production/basic-infrastructure/outputs.tf @@ -0,0 +1 @@ +../../modules/common_variables/outputs.tf \ No newline at end of file diff --git a/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate b/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate index 8cc99fa..95fb2d7 100644 --- a/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate +++ b/openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate @@ -1,16 +1,418 @@ { "version": 4, "terraform_version": "1.6.6", - "serial": 372, + "serial": 376, "lineage": "954b57a1-c68e-fa2b-cf2f-79cc54aea13e", "outputs": { + "almalinux_9": { + "value": { + "name": "AlmaLinux-9.0-20220718", + "uuid": "541650fc-dd19-4f38-bb1d-7333ed9dd688" + }, + "type": [ + "map", + "string" + ] + }, + "availability_zone_no_gpu_name": { + "value": "cnr-isti-nova-a", + "type": "string" + }, + "availability_zone_with_gpu_name": { + "value": "cnr-isti-nova-gpu-a", + "type": "string" + }, + "availability_zones_names": { + "value": { + "availability_zone_no_gpu": "cnr-isti-nova-a", + "availability_zone_with_gpu": "cnr-isti-nova-gpu-a" + }, + "type": [ + "map", + "string" + ] + }, + "basic_services_ip": { + "value": { + "ca": "10.1.40.4", + "ca_cidr": "10.1.40.4/32", + "haproxy_l7_1": "10.1.40.11", + "haproxy_l7_1_cidr": "10.1.40.11/32", + "haproxy_l7_2": "10.1.40.12", + "haproxy_l7_2_cidr": "10.1.40.12/32", + "octavia_main": "10.1.40.20", + "octavia_main_cidr": "10.1.40.20/32", + "prometheus": "10.1.40.10", + "prometheus_cidr": "10.1.40.10/32", + "ssh_jump": "10.1.40.5", + "ssh_jump_cidr": "10.1.40.5/32" + }, + "type": [ + "map", + "string" + ] + }, + "centos_7": { + "value": { + "name": "CentOS-7", + "uuid": "f0187a99-64f6-462a-ab5f-ef52fe62f2ca" + }, + "type": [ + "map", + "string" + ] + }, + "default_security_group_name": { + "value": "default_for_all", + "type": "string" + }, + "dns_zone": { + "value": { + "description": "DNS primary zone for the d4s-production-cloud project", + "email": "postmaster@isti.cnr.it", + "ttl": "8600", + "zone_name": "cloud.d4science.org." + }, + "type": [ + "map", + "string" + ] + }, + "el7_data_file": { + "value": "../../openstack_vm_data_scripts/el7.sh", + "type": "string" + }, + "external_network": { + "value": { + "id": "1d2ff137-6ff7-4017-be2b-0d6c4af2353b", + "name": "external-network" + }, + "type": [ + "map", + "string" + ] + }, + "external_network_id": { + "value": "1d2ff137-6ff7-4017-be2b-0d6c4af2353b", + "type": "string" + }, + "external_router": { + "value": { + "description": "D4Science Production main router", + "name": "d4s-production-cloud-external-router" + }, + "type": [ + "map", + "string" + ] + }, + "flavor_list": { + "value": { + "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", + "m3_large": "m3.large" + }, + "type": [ + "map", + "string" + ] + }, + "floating_ip_pools": { + "value": { + "main_public_ip_pool": "external-network" + }, + "type": [ + "map", + "string" + ] + }, + "haproxy_l7_data": { + "value": { + "flavor": "m1.medium", + "haproxy_1": "haproxy-l7-1", + "haproxy_2": "haproxy-l7-2", + "name": "main-haproxy-l7", + "vm_count": "2" + }, + "type": [ + "map", + "string" + ] + }, + "internal_ca_data": { + "value": { + "flavor": "m1.small", + "name": "ca" + }, + "type": [ + "map", + "string" + ] + }, + "main_haproxy_l7_ip": { + "value": [ + "10.1.40.11", + "10.1.40.12" + ], + "type": [ + "list", + "string" + ] + }, "main_loadbalancer_ip": { "value": "10.1.40.20", "type": "string" }, + "main_private_network": { + "value": { + "description": "D4Science Production private network (use this as the main network)", + "name": "d4s-production-cloud-main" + }, + "type": [ + "map", + "string" + ] + }, + "main_private_subnet": { + "value": { + "allocation_end": "10.1.47.254", + "allocation_start": "10.1.41.100", + "cidr": "10.1.40.0/21", + "description": "D4Science Production main private subnet", + "gateway_ip": "10.1.40.1", + "name": "d4s-production-cloud-main-subnet" + }, + "type": [ + "map", + "string" + ] + }, + "main_region": { + "value": "isti_area_pi_1", + "type": "string" + }, + "mtu_size": { + "value": 8942, + "type": "number" + }, + "networks_list": { + "value": { + "orientdb": "orientdb-net", + "orientdb_se": "orientdb-se-net", + "shared_postgresql": "postgresql-srv-net", + "swarm": "swarm-nfs-net", + "timescaledb": "timescaledb-net" + }, + "type": [ + "map", + "string" + ] + }, + "networks_with_d4s_services": { + "value": { + "garr_ct1_net": "90.147.166.0/23", + "garr_na_net": "90.147.152.0/24", + "garr_pa1_net": "90.147.188.0/23", + "infrascience_net": "146.48.122.0/23", + "isti_net": "146.48.80.0/21", + "s2i2s_net": "146.48.28.0/22" + }, + "type": [ + "map", + "string" + ] + }, + "octavia_information": { + "value": { + "main_lb_description": "Main L4 load balancer for the D4Science production", + "main_lb_hostname": "main-lb", + "main_lb_name": "d4s-production-cloud-l4-load-balancer", + "octavia_flavor": "octavia_amphora-mvcpu-ha", + "octavia_flavor_id": "394988b5-6603-4a1e-a939-8e177c6681c7", + "octavia_vrrp_ip_1": "10.1.42.119/32", + "octavia_vrrp_ip_2": "10.1.42.188/32", + "swarm_lb_name": "d4s-production-cloud-l4-swarm-load-balancer" + }, + "type": [ + "map", + "string" + ] + }, + "os_project_data": { + "value": { + "id": "1b45adf388934758b56d0dfdb4bfacf3" + }, + "type": [ + "map", + "string" + ] + }, + "policy_list": { + "value": { + "affinity": "affinity", + "anti_affinity": "anti-affinity", + "soft_affinity": "soft-affinity", + "soft_anti_affinity": "soft-anti-affinity" + }, + "type": [ + "map", + "string" + ] + }, + "prometheus_server_data": { + "value": { + "flavor": "m1.medium", + "name": "prometheus", + "public_grafana_server_cidr": "146.48.28.103/32", + "vol_data_device": "/dev/vdb", + "vol_data_name": "prometheus-data", + "vol_data_size": "100" + }, + "type": [ + "map", + "string" + ] + }, + "resolvers_ip": { + "value": [ + "146.48.29.97", + "146.48.29.98", + "146.48.29.99" + ], + "type": [ + "list", + "string" + ] + }, + "resource_registry_addresses": { + "value": {}, + "type": [ + "map", + "string" + ] + }, + "security_group_list": { + "value": { + "acaland": "acaland's dev machine", + "access_to_orientdb": "access_to_orientdb", + "access_to_orientdb_se": "access_to_orientdb_se", + "access_to_the_timescaledb_service": "access_to_the_timescaledb_service", + "cassandra": "Cassandra", + "dataminer-publish": "dataminer-publish", + "debugging_from_jump_node": "debugging_from_jump_node", + "default": "default", + "docker_swarm": "Docker Swarm", + "docker_swarm_NFS": "Docker Swarm NFS", + "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", + "orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic", + "postgreSQL": "PostgreSQL service", + "public_HTTPS": "Public HTTPS" + }, + "type": [ + "map", + "string" + ] + }, + "shared_postgresql_server_data": { + "value": { + "allocation_pool_end": "192.168.3.254", + "allocation_pool_start": "192.168.0.100", + "flavor": "m1.large", + "name": "shared-postgresql-server", + "network_cidr": "192.168.0.0/22", + "network_description": "Network used to communicate with the shared postgresql service", + "network_name": "postgresql-srv-net", + "server_cidr": "192.168.0.5/22", + "server_ip": "192.168.0.5", + "vol_backup_device": "/dev/vdc", + "vol_backup_name": "shared-postgresql-backup-data", + "vol_backup_size": "100", + "vol_data_device": "/dev/vdb", + "vol_data_name": "shared-postgresql-data", + "vol_data_size": "300" + }, + "type": [ + "map", + "string" + ] + }, + "smartexecutor_addresses": { + "value": {}, + "type": [ + "map", + "string" + ] + }, + "ssh_jump_proxy": { + "value": { + "flavor": "m2.small", + "name": "ssh-jump-proxy" + }, + "type": [ + "map", + "string" + ] + }, + "ssh_sources": { + "value": { + "d4s_vpn_1_cidr": "146.48.122.27/32", + "d4s_vpn_2_cidr": "146.48.122.49/32", + "infrascience_net_cidr": "146.48.122.0/23", + "s2i2s_vpn_1_cidr": "146.48.28.10/32", + "s2i2s_vpn_2_cidr": "146.48.28.11/32", + "shell_d4s_cidr": "146.48.122.95/32" + }, + "type": [ + "map", + "string" + ] + }, "swarm_loadbalancer_ip": { "value": "10.1.40.30", "type": "string" + }, + "ubuntu1804_data_file": { + "value": "../../openstack_vm_data_scripts/ubuntu1804.sh", + "type": "string" + }, + "ubuntu2204_data_file": { + "value": "../../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", + "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627" + }, + "type": [ + "map", + "string" + ] } }, "resources": [ @@ -4509,13 +4911,13 @@ "description": "Allow HTTPS from grafana.d4science.org", "direction": "ingress", "ethertype": "IPv4", - "id": "cead8aae-79c3-4f36-b458-8ab036ed15fc", + "id": "a79c9e2d-36ae-4e27-9c61-f9f20f7281df", "port_range_max": 443, "port_range_min": 443, "protocol": "tcp", "region": "isti_area_pi_1", "remote_group_id": "", - "remote_ip_prefix": "146.48.122.132/32", + "remote_ip_prefix": "146.48.28.103/32", "security_group_id": "5523b084-49a5-4990-a5e0-1d267287e318", "tenant_id": "1b45adf388934758b56d0dfdb4bfacf3", "timeouts": null diff --git a/openstack-tf/modules/common_variables/variables.tf b/openstack-tf/modules/common_variables/variables.tf index 2fb96ba..9cd1eb9 100644 --- a/openstack-tf/modules/common_variables/variables.tf +++ b/openstack-tf/modules/common_variables/variables.tf @@ -108,7 +108,7 @@ variable "prometheus_server_data" { vol_data_name = "prometheus-data" vol_data_size = "100" vol_data_device = "/dev/vdb" - public_grafana_server_cidr = "146.48.122.132/32" + public_grafana_server_cidr = "146.48.28.103/32" } }