From 2f37287b459ff391a7193b5e6105914cfdc7d63b Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 7 Dec 2023 09:35:37 +0100 Subject: [PATCH] Refactored smart-executor instances --- .../d4s-dev/smart-executor/dev.auto.tfvars | 1 - openstack-tf/d4s-dev/smart-executor/main.tf | 106 +++- .../d4s-dev/smart-executor/provider.tf | 3 +- .../d4s-dev/smart-executor/smart-executor.tf | 1 - .../d4s-dev/smart-executor/terraform.tfstate | 555 ++++++++++++------ .../variables-smart-executor.tf | 1 - .../d4s-dev/smart-executor/variables.tf | 1 - 7 files changed, 492 insertions(+), 176 deletions(-) delete mode 120000 openstack-tf/d4s-dev/smart-executor/dev.auto.tfvars delete mode 120000 openstack-tf/d4s-dev/smart-executor/smart-executor.tf delete mode 120000 openstack-tf/d4s-dev/smart-executor/variables-smart-executor.tf delete mode 120000 openstack-tf/d4s-dev/smart-executor/variables.tf diff --git a/openstack-tf/d4s-dev/smart-executor/dev.auto.tfvars b/openstack-tf/d4s-dev/smart-executor/dev.auto.tfvars deleted file mode 120000 index 55e7b69c..00000000 --- a/openstack-tf/d4s-dev/smart-executor/dev.auto.tfvars +++ /dev/null @@ -1 +0,0 @@ -../variables/dev.auto.tfvars \ No newline at end of file diff --git a/openstack-tf/d4s-dev/smart-executor/main.tf b/openstack-tf/d4s-dev/smart-executor/main.tf index a1f4a32c..aef796da 100644 --- a/openstack-tf/d4s-dev/smart-executor/main.tf +++ b/openstack-tf/d4s-dev/smart-executor/main.tf @@ -1,6 +1,6 @@ # Define required providers terraform { -required_version = ">= 0.14.0" + required_version = ">= 0.14.0" required_providers { openstack = { source = "terraform-provider-openstack/openstack" @@ -15,4 +15,106 @@ data "terraform_remote_state" "privnet_dns_router" { config = { path = "../project-setup/terraform.tfstate" } -} \ No newline at end of file +} + +# +# Uses common_variables as module +# +module "common_variables" { + source = "../../modules/common_variables" +} + + +# +# Creates the server group "accounting-dashboard-harvester-se-plugin" +# +resource "openstack_compute_servergroup_v2" "accounting_dashboard_harvester_server_group" { + name = "accounting-dashboard-harvester-se-plugin" + policies = [module.common_variables.policy_list.soft_anti_affinity] +} + +# +# Creates the server group "accounting-aggregator-se-plugin" +# +resource "openstack_compute_servergroup_v2" "accounting_aggregator_server_group" { + name = "accounting-aggregator-se-plugin" + policies = [module.common_variables.policy_list.soft_anti_affinity] +} + +# +# Creates the server group "resource-checker-se-plugin" +# +resource "openstack_compute_servergroup_v2" "resource_checker_server_group" { + name = "resource-checker-se-plugin" + policies = [module.common_variables.policy_list.soft_anti_affinity] +} + +# +# Creates the server group "social-data-indexer-se-plugin" +# +resource "openstack_compute_servergroup_v2" "social_data_indexer_server_group" { + name = "social-data-indexer-se-plugin" + policies = [module.common_variables.policy_list.soft_anti_affinity] +} + +# +# Creates the server group "accounting-insert-storage-se-plugin" +# +resource "openstack_compute_servergroup_v2" "accounting_insert_storage_server_group" { + name = "accounting-insert-storage-se-plugin" + policies = [module.common_variables.policy_list.soft_anti_affinity] +} + + +module "instance_without_data_volume" { + source = "../../modules/instance_without_data_volume" + + instances_without_data_volume_map = { + accounting_dashboard_harvester_se_plugin = { + name = "accounting-dashboard-harvester-se-plugin", + description = "This instance serves smart-executor service with accounting-dashboard-harvester-se-plugin", + flavor = module.common_variables.flavor_list.m1_medium, + networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.orientdb_se, module.common_variables.networks_list.timescaledb, module.common_variables.networks_list.shared_postgresql], + security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], + server_groups_ids = [openstack_compute_servergroup_v2.accounting_dashboard_harvester_server_group.id], + image_ref = module.common_variables.ubuntu_1804 + }, + accounting_aggregator_se_plugin = { + name = "accounting-aggregator-se-plugin", + description = "This instance serves smart-executor service with accounting-aggregator-se-plugin", + flavor = module.common_variables.flavor_list.m1_medium, + networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.orientdb_se, module.common_variables.networks_list.timescaledb], + security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], + server_groups_ids = [openstack_compute_servergroup_v2.accounting_aggregator_server_group.id], + image_ref = module.common_variables.ubuntu_1804 + }, + 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, + networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.orientdb_se], + security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], + server_groups_ids = [openstack_compute_servergroup_v2.resource_checker_server_group.id], + image_ref = module.common_variables.ubuntu_1804 + }, + # Social Data Indexer should access to Cassandra too + 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, + networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.orientdb_se], + security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], + server_groups_ids = [openstack_compute_servergroup_v2.social_data_indexer_server_group.id], + image_ref = module.common_variables.ubuntu_1804 + }, + 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, + networks = ["d4s-dev-cloud-main", module.common_variables.networks_list.orientdb_se], + security_groups = [module.common_variables.security_group_list.default, module.common_variables.security_group_list.http_and_https_from_the_load_balancers], + server_groups_ids = [openstack_compute_servergroup_v2.accounting_insert_storage_server_group.id], + image_ref = module.common_variables.ubuntu_1804 + } + } +} diff --git a/openstack-tf/d4s-dev/smart-executor/provider.tf b/openstack-tf/d4s-dev/smart-executor/provider.tf index df431972..fa7a121a 100644 --- a/openstack-tf/d4s-dev/smart-executor/provider.tf +++ b/openstack-tf/d4s-dev/smart-executor/provider.tf @@ -1,4 +1,3 @@ provider "openstack" { - cloud = "d4s-dev" + cloud = "d4s-dev" } - diff --git a/openstack-tf/d4s-dev/smart-executor/smart-executor.tf b/openstack-tf/d4s-dev/smart-executor/smart-executor.tf deleted file mode 120000 index 66898366..00000000 --- a/openstack-tf/d4s-dev/smart-executor/smart-executor.tf +++ /dev/null @@ -1 +0,0 @@ -../../modules/smart-executor/smart-executor.tf \ No newline at end of file diff --git a/openstack-tf/d4s-dev/smart-executor/terraform.tfstate b/openstack-tf/d4s-dev/smart-executor/terraform.tfstate index ede75c2a..874824bf 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": 9, + "serial": 25, "lineage": "ae8eda4c-51c3-13f0-219b-df8ea9af7818", "outputs": {}, "resources": [ @@ -52,100 +52,156 @@ }, { "mode": "managed", - "type": "openstack_compute_instance_v2", - "name": "accounting_aggregator", + "type": "openstack_compute_servergroup_v2", + "name": "accounting_aggregator_server_group", "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ { "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.31.157", - "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": "7ed6a2cd-2b07-482e-8ce4-f018dff16c89", - "volume_size": 10, - "volume_type": "" - } - ], - "config_drive": null, - "created": "2023-11-23 11:31:58 +0000 UTC", - "flavor_id": "4", - "flavor_name": "m1.medium", - "floating_ip": null, - "force_delete": false, - "id": "896db334-83aa-4ed6-96a3-0adb7bd13b47", - "image_id": "Attempt to boot from volume - no image supplied", - "image_name": null, - "key_pair": "adellam", - "metadata": null, + "id": "2d792545-a513-4bde-a297-43afa74875df", + "members": [], "name": "accounting-aggregator-se-plugin", - "network": [ + "policies": [ + "soft-anti-affinity" + ], + "region": "isti_area_pi_1", + "rules": [ { - "access_network": false, - "fixed_ip_v4": "10.1.31.157", - "fixed_ip_v6": "", - "floating_ip": "", - "mac": "fa:16:3e:40:12:8f", - "name": "d4s-dev-cloud-main", - "port": "", - "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" - }, - { - "access_network": false, - "fixed_ip_v4": "192.168.12.141", - "fixed_ip_v6": "", - "floating_ip": "", - "mac": "fa:16:3e:94:98:8a", - "name": "orientdb-se-net", - "port": "", - "uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6" + "max_server_per_host": 0 } ], - "network_mode": null, - "personality": [], - "power_state": "active", - "region": "isti_area_pi_1", - "scheduler_hints": [], - "security_groups": [ - "default" - ], - "stop_before_destroy": false, - "tags": [], - "timeouts": null, - "updated": "2023-11-23 11:32:53 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", - "vendor_options": [], - "volume": [] + "value_specs": null }, "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19" + "private": "bnVsbA==" } ] }, { "mode": "managed", - "type": "openstack_compute_instance_v2", - "name": "accounting_dashboard_harvester", + "type": "openstack_compute_servergroup_v2", + "name": "accounting_dashboard_harvester_server_group", "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", "instances": [ { "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.30.54", + "id": "608bade3-e42b-46af-b969-25caf2e829c5", + "members": [], + "name": "accounting-dashboard-harvester-se-plugin", + "policies": [ + "soft-anti-affinity" + ], + "region": "isti_area_pi_1", + "rules": [ + { + "max_server_per_host": 0 + } + ], + "value_specs": null + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "openstack_compute_servergroup_v2", + "name": "accounting_insert_storage_server_group", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "id": "c58d1633-fe27-4175-81b1-5f13baac97fc", + "members": [], + "name": "accounting-insert-storage-se-plugin", + "policies": [ + "soft-anti-affinity" + ], + "region": "isti_area_pi_1", + "rules": [ + { + "max_server_per_host": 0 + } + ], + "value_specs": null + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "openstack_compute_servergroup_v2", + "name": "resource_checker_server_group", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "id": "fe90ec2c-8789-4c35-8420-b8dbd415be77", + "members": [], + "name": "resource-checker-se-plugin", + "policies": [ + "soft-anti-affinity" + ], + "region": "isti_area_pi_1", + "rules": [ + { + "max_server_per_host": 0 + } + ], + "value_specs": null + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + }, + { + "mode": "managed", + "type": "openstack_compute_servergroup_v2", + "name": "social_data_indexer_server_group", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "id": "04a8b534-5e8c-4e74-b22d-b575b84cd627", + "members": [], + "name": "social-data-indexer-se-plugin", + "policies": [ + "soft-anti-affinity" + ], + "region": "isti_area_pi_1", + "rules": [ + { + "max_server_per_host": 0 + } + ], + "value_specs": null + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + }, + { + "module": "module.instance_without_data_volume", + "mode": "managed", + "type": "openstack_compute_instance_v2", + "name": "smartgears_service", + "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", + "instances": [ + { + "index_key": "accounting_aggregator_se_plugin", + "schema_version": 0, + "attributes": { + "access_ip_v4": "10.1.29.228", "access_ip_v6": "", "admin_pass": null, "all_metadata": {}, @@ -168,54 +224,44 @@ } ], "config_drive": null, - "created": "2023-12-01 16:16:53 +0000 UTC", + "created": "2023-12-07 08:31:47 +0000 UTC", "flavor_id": "4", "flavor_name": "m1.medium", "floating_ip": null, "force_delete": false, - "id": "cf62340b-33dc-4bbb-b20a-712766acd9c7", + "id": "52e2d652-c4d5-48a7-ba9b-bc64b3c16883", "image_id": "Attempt to boot from volume - no image supplied", "image_name": null, - "key_pair": "adellam", + "key_pair": "pc-frosini_key", "metadata": null, - "name": "accounting-dashboard-harvester-se-plugin", + "name": "accounting-aggregator-se-plugin", "network": [ { "access_network": false, - "fixed_ip_v4": "10.1.30.54", + "fixed_ip_v4": "10.1.29.228", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:b8:9f:a0", + "mac": "fa:16:3e:27:34:0c", "name": "d4s-dev-cloud-main", "port": "", "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" }, { "access_network": false, - "fixed_ip_v4": "192.168.12.226", + "fixed_ip_v4": "192.168.12.204", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:16:42:de", + "mac": "fa:16:3e:cd:80:fc", "name": "orientdb-se-net", "port": "", "uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6" }, { "access_network": false, - "fixed_ip_v4": "192.168.2.95", + "fixed_ip_v4": "192.168.11.238", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:8b:a6:5e", - "name": "postgresql-srv-net", - "port": "", - "uuid": "00422a4a-4b8b-4c85-acf9-ef733df842b9" - }, - { - "access_network": false, - "fixed_ip_v4": "192.168.11.27", - "fixed_ip_v6": "", - "floating_ip": "", - "mac": "fa:16:3e:1b:0f:2d", + "mac": "fa:16:3e:76:a0:dc", "name": "timescaledb-net", "port": "", "uuid": "ec57aa06-17c8-4475-b4c2-3783f3c7ec7a" @@ -225,33 +271,45 @@ "personality": [], "power_state": "active", "region": "isti_area_pi_1", - "scheduler_hints": [], + "scheduler_hints": [ + { + "additional_properties": null, + "build_near_host_ip": "", + "different_cell": [], + "different_host": [], + "group": "2d792545-a513-4bde-a297-43afa74875df", + "query": [], + "same_host": [], + "target_cell": "" + } + ], "security_groups": [ - "default" + "default", + "http and https from the load balancers" ], "stop_before_destroy": false, "tags": null, "timeouts": null, - "updated": "2023-12-01 16:17:28 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "updated": "2023-12-07 08:33:25 +0000 UTC", + "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", "vendor_options": [], "volume": [] }, "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19" - } - ] - }, - { - "mode": "managed", - "type": "openstack_compute_instance_v2", - "name": "accounting_insert_storage", - "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", - "instances": [ + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "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", + "openstack_compute_servergroup_v2.resource_checker_server_group", + "openstack_compute_servergroup_v2.social_data_indexer_server_group" + ] + }, { + "index_key": "accounting_dashboard_harvester_se_plugin", "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.31.185", + "access_ip_v4": "10.1.29.183", "access_ip_v6": "", "admin_pass": null, "all_metadata": {}, @@ -274,34 +332,152 @@ } ], "config_drive": null, - "created": "2023-11-23 11:31:58 +0000 UTC", + "created": "2023-12-07 08:31:49 +0000 UTC", + "flavor_id": "4", + "flavor_name": "m1.medium", + "floating_ip": null, + "force_delete": false, + "id": "112aa21b-ca8c-4a8c-af5f-c48984483d05", + "image_id": "Attempt to boot from volume - no image supplied", + "image_name": null, + "key_pair": "pc-frosini_key", + "metadata": null, + "name": "accounting-dashboard-harvester-se-plugin", + "network": [ + { + "access_network": false, + "fixed_ip_v4": "10.1.29.183", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:2d:a9:70", + "name": "d4s-dev-cloud-main", + "port": "", + "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" + }, + { + "access_network": false, + "fixed_ip_v4": "192.168.12.38", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:a1:d6:bb", + "name": "orientdb-se-net", + "port": "", + "uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6" + }, + { + "access_network": false, + "fixed_ip_v4": "192.168.11.30", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:be:57:f0", + "name": "timescaledb-net", + "port": "", + "uuid": "ec57aa06-17c8-4475-b4c2-3783f3c7ec7a" + }, + { + "access_network": false, + "fixed_ip_v4": "192.168.2.122", + "fixed_ip_v6": "", + "floating_ip": "", + "mac": "fa:16:3e:0d:f1:9c", + "name": "postgresql-srv-net", + "port": "", + "uuid": "00422a4a-4b8b-4c85-acf9-ef733df842b9" + } + ], + "network_mode": null, + "personality": [], + "power_state": "active", + "region": "isti_area_pi_1", + "scheduler_hints": [ + { + "additional_properties": null, + "build_near_host_ip": "", + "different_cell": [], + "different_host": [], + "group": "608bade3-e42b-46af-b969-25caf2e829c5", + "query": [], + "same_host": [], + "target_cell": "" + } + ], + "security_groups": [ + "default", + "http and https from the load balancers" + ], + "stop_before_destroy": false, + "tags": null, + "timeouts": null, + "updated": "2023-12-07 08:34:15 +0000 UTC", + "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", + "vendor_options": [], + "volume": [] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "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", + "openstack_compute_servergroup_v2.resource_checker_server_group", + "openstack_compute_servergroup_v2.social_data_indexer_server_group" + ] + }, + { + "index_key": "accounting_insert_storage_se_plugin", + "schema_version": 0, + "attributes": { + "access_ip_v4": "10.1.28.104", + "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": "7ed6a2cd-2b07-482e-8ce4-f018dff16c89", + "volume_size": 10, + "volume_type": "" + } + ], + "config_drive": null, + "created": "2023-12-07 08:31:47 +0000 UTC", "flavor_id": "3", "flavor_name": "c1.small", "floating_ip": null, "force_delete": false, - "id": "859ceb6b-22a6-41d1-b80d-6cef299075ec", + "id": "7bb6f8cf-f4dc-4465-aeec-ec76d45980a0", "image_id": "Attempt to boot from volume - no image supplied", "image_name": null, - "key_pair": "adellam", + "key_pair": "pc-frosini_key", "metadata": null, "name": "accounting-insert-storage-se-plugin", "network": [ { "access_network": false, - "fixed_ip_v4": "10.1.31.185", + "fixed_ip_v4": "10.1.28.104", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:cc:5e:7c", + "mac": "fa:16:3e:54:35:3a", "name": "d4s-dev-cloud-main", "port": "", "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" }, { "access_network": false, - "fixed_ip_v4": "192.168.12.30", + "fixed_ip_v4": "192.168.12.13", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:67:fe:74", + "mac": "fa:16:3e:c7:3c:d4", "name": "orientdb-se-net", "port": "", "uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6" @@ -311,33 +487,45 @@ "personality": [], "power_state": "active", "region": "isti_area_pi_1", - "scheduler_hints": [], + "scheduler_hints": [ + { + "additional_properties": null, + "build_near_host_ip": "", + "different_cell": [], + "different_host": [], + "group": "c58d1633-fe27-4175-81b1-5f13baac97fc", + "query": [], + "same_host": [], + "target_cell": "" + } + ], "security_groups": [ - "default" + "default", + "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": [], + "tags": null, "timeouts": null, - "updated": "2023-11-23 11:32:48 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "updated": "2023-12-07 08:33:38 +0000 UTC", + "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", "vendor_options": [], "volume": [] }, "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19" - } - ] - }, - { - "mode": "managed", - "type": "openstack_compute_instance_v2", - "name": "resource_checker", - "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", - "instances": [ + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "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", + "openstack_compute_servergroup_v2.resource_checker_server_group", + "openstack_compute_servergroup_v2.social_data_indexer_server_group" + ] + }, { + "index_key": "resource_checker_se_plugin", "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.31.155", + "access_ip_v4": "10.1.28.207", "access_ip_v6": "", "admin_pass": null, "all_metadata": {}, @@ -360,34 +548,34 @@ } ], "config_drive": null, - "created": "2023-11-23 11:31:58 +0000 UTC", + "created": "2023-12-07 08:31:47 +0000 UTC", "flavor_id": "3", "flavor_name": "c1.small", "floating_ip": null, "force_delete": false, - "id": "54f38a23-fc25-4b83-8a79-4f39b561c141", + "id": "bd45a9a2-3794-4d22-a52d-d5e77c8e84df", "image_id": "Attempt to boot from volume - no image supplied", "image_name": null, - "key_pair": "adellam", + "key_pair": "pc-frosini_key", "metadata": null, "name": "resource-checker-se-plugin", "network": [ { "access_network": false, - "fixed_ip_v4": "10.1.31.155", + "fixed_ip_v4": "10.1.28.207", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:8f:c0:36", + "mac": "fa:16:3e:ae:67:46", "name": "d4s-dev-cloud-main", "port": "", "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" }, { "access_network": false, - "fixed_ip_v4": "192.168.12.51", + "fixed_ip_v4": "192.168.12.247", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:7b:f7:f4", + "mac": "fa:16:3e:93:2d:db", "name": "orientdb-se-net", "port": "", "uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6" @@ -397,33 +585,45 @@ "personality": [], "power_state": "active", "region": "isti_area_pi_1", - "scheduler_hints": [], + "scheduler_hints": [ + { + "additional_properties": null, + "build_near_host_ip": "", + "different_cell": [], + "different_host": [], + "group": "fe90ec2c-8789-4c35-8420-b8dbd415be77", + "query": [], + "same_host": [], + "target_cell": "" + } + ], "security_groups": [ - "default" + "default", + "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": [], + "tags": null, "timeouts": null, - "updated": "2023-11-23 11:32:50 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "updated": "2023-12-07 08:32:53 +0000 UTC", + "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", "vendor_options": [], "volume": [] }, "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19" - } - ] - }, - { - "mode": "managed", - "type": "openstack_compute_instance_v2", - "name": "social_data_indexer", - "provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]", - "instances": [ + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "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", + "openstack_compute_servergroup_v2.resource_checker_server_group", + "openstack_compute_servergroup_v2.social_data_indexer_server_group" + ] + }, { + "index_key": "social_data_indexer_se_plugin", "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.30.173", + "access_ip_v4": "10.1.30.238", "access_ip_v6": "", "admin_pass": null, "all_metadata": {}, @@ -446,34 +646,34 @@ } ], "config_drive": null, - "created": "2023-11-23 11:31:58 +0000 UTC", + "created": "2023-12-07 08:31:48 +0000 UTC", "flavor_id": "3", "flavor_name": "c1.small", "floating_ip": null, "force_delete": false, - "id": "5109e0c1-6c9b-4435-a9f3-8b8fc954545a", + "id": "aaaea3c0-a75c-4248-8d03-660f0a484ab4", "image_id": "Attempt to boot from volume - no image supplied", "image_name": null, - "key_pair": "adellam", + "key_pair": "pc-frosini_key", "metadata": null, "name": "social-data-indexer-se-plugin", "network": [ { "access_network": false, - "fixed_ip_v4": "10.1.30.173", + "fixed_ip_v4": "10.1.30.238", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:2b:36:52", + "mac": "fa:16:3e:18:28:0d", "name": "d4s-dev-cloud-main", "port": "", "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" }, { "access_network": false, - "fixed_ip_v4": "192.168.12.89", + "fixed_ip_v4": "192.168.12.94", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:3c:2f:cd", + "mac": "fa:16:3e:f0:74:82", "name": "orientdb-se-net", "port": "", "uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6" @@ -483,20 +683,39 @@ "personality": [], "power_state": "active", "region": "isti_area_pi_1", - "scheduler_hints": [], + "scheduler_hints": [ + { + "additional_properties": null, + "build_near_host_ip": "", + "different_cell": [], + "different_host": [], + "group": "04a8b534-5e8c-4e74-b22d-b575b84cd627", + "query": [], + "same_host": [], + "target_cell": "" + } + ], "security_groups": [ - "default" + "default", + "http and https from the load balancers" ], "stop_before_destroy": false, - "tags": [], + "tags": null, "timeouts": null, - "updated": "2023-11-23 11:32:44 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "updated": "2023-12-07 08:32:26 +0000 UTC", + "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", "vendor_options": [], "volume": [] }, "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19" + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19", + "dependencies": [ + "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", + "openstack_compute_servergroup_v2.resource_checker_server_group", + "openstack_compute_servergroup_v2.social_data_indexer_server_group" + ] } ] } diff --git a/openstack-tf/d4s-dev/smart-executor/variables-smart-executor.tf b/openstack-tf/d4s-dev/smart-executor/variables-smart-executor.tf deleted file mode 120000 index ebfa2b22..00000000 --- a/openstack-tf/d4s-dev/smart-executor/variables-smart-executor.tf +++ /dev/null @@ -1 +0,0 @@ -../../modules/smart-executor/variables-smart-executor.tf \ No newline at end of file diff --git a/openstack-tf/d4s-dev/smart-executor/variables.tf b/openstack-tf/d4s-dev/smart-executor/variables.tf deleted file mode 120000 index be9f7878..00000000 --- a/openstack-tf/d4s-dev/smart-executor/variables.tf +++ /dev/null @@ -1 +0,0 @@ -../../modules/common_variables/variables.tf \ No newline at end of file