diff --git a/openstack-tf/d4s-dev/gcat/main.tf b/openstack-tf/d4s-dev/gcat/main.tf index bb980e3b..6b02b94c 100644 --- a/openstack-tf/d4s-dev/gcat/main.tf +++ b/openstack-tf/d4s-dev/gcat/main.tf @@ -26,7 +26,7 @@ module "common_variables" { # -# Creates the server group "uri-resolver" +# Creates the server group "gcat" # resource "openstack_compute_servergroup_v2" "gcat_server_group" { name = "gcat" diff --git a/openstack-tf/d4s-dev/gcat/terraform.tfstate b/openstack-tf/d4s-dev/gcat/terraform.tfstate index 89402e19..150fe918 100644 --- a/openstack-tf/d4s-dev/gcat/terraform.tfstate +++ b/openstack-tf/d4s-dev/gcat/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.6.4", - "serial": 9, + "serial": 14, "lineage": "8a740e95-13ce-029b-b372-f1b423772e3f", "outputs": {}, "resources": [ @@ -60,7 +60,10 @@ "schema_version": 0, "attributes": { "id": "f580e6ef-93ec-4926-b7fb-6db6fc7160a5", - "members": [], + "members": [ + "3cdfe9a1-61c4-4c3e-8f8e-5af2fa2e6f3d", + "d92bed2c-cca3-4681-8a40-d01a639ff6f3" + ], "name": "gcat", "policies": [ "soft-anti-affinity" @@ -89,7 +92,7 @@ "index_key": "gcat_1", "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.31.87", + "access_ip_v4": "10.1.30.176", "access_ip_v6": "", "admin_pass": null, "all_metadata": {}, @@ -112,12 +115,12 @@ } ], "config_drive": null, - "created": "2023-12-05 11:09:51 +0000 UTC", + "created": "2023-12-05 11:41:32 +0000 UTC", "flavor_id": "4", "flavor_name": "m1.medium", "floating_ip": null, "force_delete": false, - "id": "d92bed2c-cca3-4681-8a40-d01a639ff6f3", + "id": "60eb54dd-39c7-42d9-8231-f360492e9405", "image_id": "Attempt to boot from volume - no image supplied", "image_name": null, "key_pair": "pc-frosini_key", @@ -126,10 +129,10 @@ "network": [ { "access_network": false, - "fixed_ip_v4": "10.1.31.87", + "fixed_ip_v4": "10.1.30.176", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:a1:e7:ee", + "mac": "fa:16:3e:31:89:35", "name": "d4s-dev-cloud-main", "port": "", "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" @@ -158,8 +161,8 @@ "stop_before_destroy": false, "tags": null, "timeouts": null, - "updated": "2023-12-05 11:10:49 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "updated": "2023-12-05 11:42:04 +0000 UTC", + "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", "vendor_options": [], "volume": [] }, @@ -173,7 +176,7 @@ "index_key": "gcat_2", "schema_version": 0, "attributes": { - "access_ip_v4": "10.1.29.12", + "access_ip_v4": "10.1.28.116", "access_ip_v6": "", "admin_pass": null, "all_metadata": {}, @@ -196,12 +199,12 @@ } ], "config_drive": null, - "created": "2023-12-05 11:09:51 +0000 UTC", + "created": "2023-12-05 11:41:31 +0000 UTC", "flavor_id": "4", "flavor_name": "m1.medium", "floating_ip": null, "force_delete": false, - "id": "3cdfe9a1-61c4-4c3e-8f8e-5af2fa2e6f3d", + "id": "4f58c353-0a5c-46a9-9ffb-19d70de366cb", "image_id": "Attempt to boot from volume - no image supplied", "image_name": null, "key_pair": "pc-frosini_key", @@ -210,10 +213,10 @@ "network": [ { "access_network": false, - "fixed_ip_v4": "10.1.29.12", + "fixed_ip_v4": "10.1.28.116", "fixed_ip_v6": "", "floating_ip": "", - "mac": "fa:16:3e:4e:14:19", + "mac": "fa:16:3e:a0:2f:e6", "name": "d4s-dev-cloud-main", "port": "", "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" @@ -242,8 +245,8 @@ "stop_before_destroy": false, "tags": null, "timeouts": null, - "updated": "2023-12-05 11:10:25 +0000 UTC", - "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", + "updated": "2023-12-05 11:42:08 +0000 UTC", + "user_data": "ef3d6e5deb29bd1e5de5a76ae6860f3ee872738c", "vendor_options": [], "volume": [] }, diff --git a/openstack-tf/d4s-dev/resource-registry/main.tf b/openstack-tf/d4s-dev/resource-registry/main.tf index a7cf0cce..c62a3bc3 100644 --- a/openstack-tf/d4s-dev/resource-registry/main.tf +++ b/openstack-tf/d4s-dev/resource-registry/main.tf @@ -17,6 +17,22 @@ data "terraform_remote_state" "privnet_dns_router" { } } +# +# Uses common_variables as module +# +module "common_variables" { + source = "../../modules/common_variables" +} + + +# +# Creates the server group "resource-registry" +# +resource "openstack_compute_servergroup_v2" "resource_registry_server_group" { + name = "resource-registry" + policies = [module.common_variables.policy_list.soft_anti_affinity] +} + module "smartgears_service_generic" { source = "../../modules/generic_smartgears_service" @@ -25,18 +41,20 @@ module "smartgears_service_generic" { resource_registry_1 = { name = "resource-registry-1", description = "This instance serves resource-registry service", - flavor = "m1.medium", + flavor = module.common_variables.flavor_list.m1_medium, networks = ["d4s-dev-cloud-main", "orientdb-net"], - security_groups = ["default", "http and https from the load balancers"] - block_device_uuid = "7ed6a2cd-2b07-482e-8ce4-f018dff16c89" #ubuntu_18_04.uuid of DEV + 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_registry_server_group.id], + image_ref = module.common_variables.ubuntu_1804 }, resource_registry_2 = { name = "resource-registry-1", description = "This instance serves resource-registry service", flavor = "m1.medium", networks = ["d4s-dev-cloud-main", "orientdb-net"], - security_groups = ["default", "http and https from the load balancers"] - block_device_uuid = "7ed6a2cd-2b07-482e-8ce4-f018dff16c89" #ubuntu_18_04.uuid of DEV + 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_registry_server_group.id], + image_ref = module.common_variables.ubuntu_1804 } } }