diff --git a/openstack-tf/d4s-dev/smart-executor/main.tf b/openstack-tf/d4s-dev/smart-executor/main.tf index 94072140..73740394 100644 --- a/openstack-tf/d4s-dev/smart-executor/main.tf +++ b/openstack-tf/d4s-dev/smart-executor/main.tf @@ -91,7 +91,7 @@ module "instance_without_data_volume" { resource_checker_se_plugin = { name = "resource-checker-se-plugin", description = "This instance serves smart-executor service with resource-checker-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [openstack_compute_servergroup_v2.resource_checker_server_group.id], @@ -101,7 +101,7 @@ module "instance_without_data_volume" { social_data_indexer_se_plugin = { name = "social-data-indexer-se-plugin", description = "This instance serves smart-executor service with social-data-indexer-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [openstack_compute_servergroup_v2.social_data_indexer_server_group.id], @@ -110,7 +110,7 @@ module "instance_without_data_volume" { accounting_insert_storage_se_plugin = { name = "accounting-insert-storage-se-plugin", description = "This instance serves smart-executor service with accounting-insert-storage-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers], server_groups_ids = [openstack_compute_servergroup_v2.accounting_insert_storage_server_group.id], diff --git a/openstack-tf/d4s-dev/smart-executor/terraform.tfstate b/openstack-tf/d4s-dev/smart-executor/terraform.tfstate index 874824bf..ddcea8c0 100644 --- a/openstack-tf/d4s-dev/smart-executor/terraform.tfstate +++ b/openstack-tf/d4s-dev/smart-executor/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.4", - "serial": 25, + "serial": 29, "lineage": "ae8eda4c-51c3-13f0-219b-df8ea9af7818", "outputs": {}, "resources": [ @@ -29,18 +29,350 @@ "defaults": null, "outputs": { "value": { + "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", + "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.29.247", + "ca_cidr": "10.1.29.247/32", + "haproxy_l7_1": "10.1.28.50", + "haproxy_l7_1_cidr": "10.1.28.50/32", + "haproxy_l7_2": "10.1.30.241", + "haproxy_l7_2_cidr": "10.1.30.241/32", + "octavia_main": "10.1.28.227", + "octavia_main_cidr": "10.1.28.227/32", + "prometheus": "10.1.30.129", + "prometheus_cidr": "10.1.30.129/32", + "ssh_jump": "10.1.29.164", + "ssh_jump_cidr": "10.1.29.164/32" + }, + "centos_7": { + "name": "CentOS-7", + "uuid": "f0187a99-64f6-462a-ab5f-ef52fe62f2ca" + }, + "default_security_group_name": "default", + "dns_zone": { + "description": "DNS primary zone for the d4s-dev-cloud project", + "email": "postmaster@isti.cnr.it", + "ttl": "8600", + "zone_name": "cloud-dev.d4science.org." + }, "dns_zone_id": "cbae638a-9d99-44aa-946c-0f5ffb7fc488", - "external_gateway_ip": "146.48.31.109", + "el7_data_file": "../../openstack_vm_data_scripts/el7.sh", + "external_gateway_ip": [ + { + "ip_address": "146.48.31.109", + "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_router": { + "description": "D4Science DEV main router", + "id": "2ae28c5f-036b-45db-bc9f-5bab8fa3e914", + "name": "d4s-dev-cloud-external-router" + }, + "flavor_list": { + "c1_large": "c1.large", + "c1_medium": "c1.medium", + "c1_small": "c1.small", + "m1_large": "m1.large", + "m1_medium": "m1.medium", + "m1_xlarge": "m1.xlarge", + "m2_large": "m2.large", + "m2_medium": "m2.medium", + "m2_small": "m2.small" + }, + "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.28.50", + "10.1.30.241" + ], + "main_private_network": { + "description": "D4Science DEV private network (use this as the main network)", + "name": "d4s-dev-cloud-main" + }, "main_private_network_id": "e0af5eba-f24a-4d0d-8184-bc654b980c4a", - "main_subnet_network_id": "2aa977f2-80b4-447c-a6b0-dfa06bf68751" + "main_private_subnet": { + "allocation_end": "10.1.31.254", + "allocation_start": "10.1.28.30", + "cidr": "10.1.28.0/22", + "description": "D4Science DEV main private subnet", + "gateway_ip": "10.1.28.1", + "name": "d4s-dev-cloud-sub" + }, + "main_region": "isti_area_pi_1", + "main_subnet_network_id": "2aa977f2-80b4-447c-a6b0-dfa06bf68751", + "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 DEV", + "main_lb_hostname": "main-lb", + "main_lb_name": "lb-dev-l4", + "octavia_flavor": "octavia_amphora-mvcpu-ha", + "octavia_flavor_id": "394988b5-6603-4a1e-a939-8e177c6681c7" + }, + "os_project_data": { + "id": "e8f8ca72f30648a8b389b4e745ac83a9" + }, + "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" + ], + "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": "HAPROXY L7", + "http_and_https_from_the_load_balancers": "http and https from the load balancers", + "limited_HTTPS_access": "Limited HTTPS access", + "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", + "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" + }, + "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" + }, + "ubuntu_2204": { + "name": "Ubuntu-Jammy-22.04", + "user_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", + "uuid": "54768889-8556-4be4-a2eb-82a4d9b34627" + } }, "type": [ "object", { + "almalinux_9": [ + "map", + "string" + ], + "availability_zone_no_gpu_name": "string", + "availability_zone_with_gpu_name": "string", + "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", - "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_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_subnet_network_id": "string" + "main_private_subnet": [ + "map", + "string" + ], + "main_region": "string", + "main_subnet_network_id": "string", + "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" + ], + "resource_registry_addresses": [ + "map", + "string" + ], + "security_group_list": [ + "map", + "string" + ], + "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" + ] } ] }, @@ -60,7 +392,9 @@ "schema_version": 0, "attributes": { "id": "2d792545-a513-4bde-a297-43afa74875df", - "members": [], + "members": [ + "52e2d652-c4d5-48a7-ba9b-bc64b3c16883" + ], "name": "accounting-aggregator-se-plugin", "policies": [ "soft-anti-affinity" @@ -88,7 +422,9 @@ "schema_version": 0, "attributes": { "id": "608bade3-e42b-46af-b969-25caf2e829c5", - "members": [], + "members": [ + "112aa21b-ca8c-4a8c-af5f-c48984483d05" + ], "name": "accounting-dashboard-harvester-se-plugin", "policies": [ "soft-anti-affinity" @@ -116,7 +452,9 @@ "schema_version": 0, "attributes": { "id": "c58d1633-fe27-4175-81b1-5f13baac97fc", - "members": [], + "members": [ + "7bb6f8cf-f4dc-4465-aeec-ec76d45980a0" + ], "name": "accounting-insert-storage-se-plugin", "policies": [ "soft-anti-affinity" @@ -144,7 +482,9 @@ "schema_version": 0, "attributes": { "id": "fe90ec2c-8789-4c35-8420-b8dbd415be77", - "members": [], + "members": [ + "bd45a9a2-3794-4d22-a52d-d5e77c8e84df" + ], "name": "resource-checker-se-plugin", "policies": [ "soft-anti-affinity" @@ -172,7 +512,9 @@ "schema_version": 0, "attributes": { "id": "04a8b534-5e8c-4e74-b22d-b575b84cd627", - "members": [], + "members": [ + "aaaea3c0-a75c-4248-8d03-660f0a484ab4" + ], "name": "social-data-indexer-se-plugin", "policies": [ "soft-anti-affinity" @@ -273,7 +615,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -288,7 +630,7 @@ "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2023-12-07 08:33:25 +0000 UTC", "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", @@ -298,6 +640,7 @@ "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", "openstack_compute_servergroup_v2.accounting_aggregator_server_group", "openstack_compute_servergroup_v2.accounting_dashboard_harvester_server_group", "openstack_compute_servergroup_v2.accounting_insert_storage_server_group", @@ -391,7 +734,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -406,7 +749,7 @@ "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, "updated": "2023-12-07 08:34:15 +0000 UTC", "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", @@ -416,6 +759,7 @@ "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", "openstack_compute_servergroup_v2.accounting_aggregator_server_group", "openstack_compute_servergroup_v2.accounting_dashboard_harvester_server_group", "openstack_compute_servergroup_v2.accounting_insert_storage_server_group", @@ -451,8 +795,8 @@ ], "config_drive": null, "created": "2023-12-07 08:31:47 +0000 UTC", - "flavor_id": "3", - "flavor_name": "c1.small", + "flavor_id": "4", + "flavor_name": "m1.medium", "floating_ip": null, "force_delete": false, "id": "7bb6f8cf-f4dc-4465-aeec-ec76d45980a0", @@ -489,7 +833,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -504,16 +848,17 @@ "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, - "updated": "2023-12-07 08:33:38 +0000 UTC", - "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", + "updated": "2023-12-18 08:59:33 +0000 UTC", + "user_data": "", "vendor_options": [], "volume": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", "openstack_compute_servergroup_v2.accounting_aggregator_server_group", "openstack_compute_servergroup_v2.accounting_dashboard_harvester_server_group", "openstack_compute_servergroup_v2.accounting_insert_storage_server_group", @@ -549,8 +894,8 @@ ], "config_drive": null, "created": "2023-12-07 08:31:47 +0000 UTC", - "flavor_id": "3", - "flavor_name": "c1.small", + "flavor_id": "4", + "flavor_name": "m1.medium", "floating_ip": null, "force_delete": false, "id": "bd45a9a2-3794-4d22-a52d-d5e77c8e84df", @@ -587,7 +932,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -602,16 +947,17 @@ "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, - "updated": "2023-12-07 08:32:53 +0000 UTC", - "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", + "updated": "2023-12-18 08:59:44 +0000 UTC", + "user_data": "", "vendor_options": [], "volume": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", "openstack_compute_servergroup_v2.accounting_aggregator_server_group", "openstack_compute_servergroup_v2.accounting_dashboard_harvester_server_group", "openstack_compute_servergroup_v2.accounting_insert_storage_server_group", @@ -647,8 +993,8 @@ ], "config_drive": null, "created": "2023-12-07 08:31:48 +0000 UTC", - "flavor_id": "3", - "flavor_name": "c1.small", + "flavor_id": "4", + "flavor_name": "m1.medium", "floating_ip": null, "force_delete": false, "id": "aaaea3c0-a75c-4248-8d03-660f0a484ab4", @@ -685,7 +1031,7 @@ "region": "isti_area_pi_1", "scheduler_hints": [ { - "additional_properties": null, + "additional_properties": {}, "build_near_host_ip": "", "different_cell": [], "different_host": [], @@ -700,16 +1046,17 @@ "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": null, + "tags": [], "timeouts": null, - "updated": "2023-12-07 08:32:26 +0000 UTC", - "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", + "updated": "2023-12-18 08:59:43 +0000 UTC", + "user_data": "", "vendor_options": [], "volume": [] }, "sensitive_attributes": [], "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", "dependencies": [ + "data.terraform_remote_state.privnet_dns_router", "openstack_compute_servergroup_v2.accounting_aggregator_server_group", "openstack_compute_servergroup_v2.accounting_dashboard_harvester_server_group", "openstack_compute_servergroup_v2.accounting_insert_storage_server_group", diff --git a/openstack-tf/d4s-preprod/smart-executor/main.tf b/openstack-tf/d4s-preprod/smart-executor/main.tf index d60244be..a612d8a0 100644 --- a/openstack-tf/d4s-preprod/smart-executor/main.tf +++ b/openstack-tf/d4s-preprod/smart-executor/main.tf @@ -91,7 +91,7 @@ module "instance_without_data_volume" { resource_checker_se_plugin = { name = "resource-checker-se-plugin", description = "This instance serves smart-executor service with resource-checker-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.debugging_from_jump_node], server_groups_ids = [openstack_compute_servergroup_v2.resource_checker_server_group.id], @@ -101,7 +101,7 @@ module "instance_without_data_volume" { social_data_indexer_se_plugin = { name = "social-data-indexer-se-plugin", description = "This instance serves smart-executor service with social-data-indexer-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.debugging_from_jump_node], server_groups_ids = [openstack_compute_servergroup_v2.social_data_indexer_server_group.id], @@ -110,7 +110,7 @@ module "instance_without_data_volume" { accounting_insert_storage_se_plugin = { name = "accounting-insert-storage-se-plugin", description = "This instance serves smart-executor service with accounting-insert-storage-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.debugging_from_jump_node], server_groups_ids = [openstack_compute_servergroup_v2.accounting_insert_storage_server_group.id], diff --git a/openstack-tf/d4s-production/smart-executor/main.tf b/openstack-tf/d4s-production/smart-executor/main.tf index d60244be..a612d8a0 100644 --- a/openstack-tf/d4s-production/smart-executor/main.tf +++ b/openstack-tf/d4s-production/smart-executor/main.tf @@ -91,7 +91,7 @@ module "instance_without_data_volume" { resource_checker_se_plugin = { name = "resource-checker-se-plugin", description = "This instance serves smart-executor service with resource-checker-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.debugging_from_jump_node], server_groups_ids = [openstack_compute_servergroup_v2.resource_checker_server_group.id], @@ -101,7 +101,7 @@ module "instance_without_data_volume" { social_data_indexer_se_plugin = { name = "social-data-indexer-se-plugin", description = "This instance serves smart-executor service with social-data-indexer-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.debugging_from_jump_node], server_groups_ids = [openstack_compute_servergroup_v2.social_data_indexer_server_group.id], @@ -110,7 +110,7 @@ module "instance_without_data_volume" { accounting_insert_storage_se_plugin = { name = "accounting-insert-storage-se-plugin", description = "This instance serves smart-executor service with accounting-insert-storage-se-plugin", - flavor = module.common_variables.flavor_list.c1_small, + flavor = module.common_variables.flavor_list.m1_medium, networks = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.orientdb_se], security_groups = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.debugging_from_jump_node], server_groups_ids = [openstack_compute_servergroup_v2.accounting_insert_storage_server_group.id],