InfraScience
/
infrastructure-as-code
23
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a network to one of the smart executors.

This commit is contained in:
Andrea Dell'Amico 2023-12-01 17:18:43 +01:00
parent 7fcc551c85
commit 59321c60f8
Signed by: andrea.dellamico
GPG Key ID: 147ABE6CEB9E20FF
5 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack-tf/d4s-dev/smart_executor_nodes/dev.auto.tfvars Symbolic link
View File

@ -0,0 +1 @@
../variables/dev.auto.tfvars

40
openstack-tf/d4s-dev/smart_executor_nodes/terraform.tfstate
View File

@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.6.4", "terraform_version": "1.6.4",
"serial": 6, "serial": 9,
"lineage": "ae8eda4c-51c3-13f0-219b-df8ea9af7818", "lineage": "ae8eda4c-51c3-13f0-219b-df8ea9af7818",
"outputs": {}, "outputs": {},
"resources": [ "resources": [
@ -124,7 +124,7 @@
"default" "default"
], ],
"stop_before_destroy": false, "stop_before_destroy": false,
"tags": null, "tags": [],
"timeouts": null, "timeouts": null,
"updated": "2023-11-23 11:32:53 +0000 UTC", "updated": "2023-11-23 11:32:53 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",
@ -145,7 +145,7 @@
{ {
"schema_version": 0, "schema_version": 0,
"attributes": { "attributes": {
"access_ip_v4": "10.1.28.203", "access_ip_v4": "10.1.30.54",
"access_ip_v6": "", "access_ip_v6": "",
"admin_pass": null, "admin_pass": null,
"all_metadata": {}, "all_metadata": {},
@ -168,12 +168,12 @@
} }
], ],
"config_drive": null, "config_drive": null,
"created": "2023-11-23 11:31:58 +0000 UTC", "created": "2023-12-01 16:16:53 +0000 UTC",
"flavor_id": "4", "flavor_id": "4",
"flavor_name": "m1.medium", "flavor_name": "m1.medium",
"floating_ip": null, "floating_ip": null,
"force_delete": false, "force_delete": false,
"id": "deb96f10-afba-414b-bab7-baf0e28fd8c8", "id": "cf62340b-33dc-4bbb-b20a-712766acd9c7",
"image_id": "Attempt to boot from volume - no image supplied", "image_id": "Attempt to boot from volume - no image supplied",
"image_name": null, "image_name": null,
"key_pair": "adellam", "key_pair": "adellam",
@ -182,33 +182,43 @@
"network": [ "network": [
{ {
"access_network": false, "access_network": false,
"fixed_ip_v4": "10.1.28.203", "fixed_ip_v4": "10.1.30.54",
"fixed_ip_v6": "", "fixed_ip_v6": "",
"floating_ip": "", "floating_ip": "",
"mac": "fa:16:3e:53:4f:b2", "mac": "fa:16:3e:b8:9f:a0",
"name": "d4s-dev-cloud-main", "name": "d4s-dev-cloud-main",
"port": "", "port": "",
"uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a" "uuid": "e0af5eba-f24a-4d0d-8184-bc654b980c4a"
}, },
{ {
"access_network": false, "access_network": false,
"fixed_ip_v4": "192.168.12.67", "fixed_ip_v4": "192.168.12.226",
"fixed_ip_v6": "", "fixed_ip_v6": "",
"floating_ip": "", "floating_ip": "",
"mac": "fa:16:3e:14:25:f8", "mac": "fa:16:3e:16:42:de",
"name": "orientdb-se-net", "name": "orientdb-se-net",
"port": "", "port": "",
"uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6" "uuid": "f3123ccc-f4f9-4b82-95eb-bcd714ad38e6"
}, },
{ {
"access_network": false, "access_network": false,
"fixed_ip_v4": "192.168.2.113", "fixed_ip_v4": "192.168.2.95",
"fixed_ip_v6": "", "fixed_ip_v6": "",
"floating_ip": "", "floating_ip": "",
"mac": "fa:16:3e:a2:2b:5a", "mac": "fa:16:3e:8b:a6:5e",
"name": "postgresql-srv-net", "name": "postgresql-srv-net",
"port": "", "port": "",
"uuid": "00422a4a-4b8b-4c85-acf9-ef733df842b9" "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",
"name": "timescaledb-net",
"port": "",
"uuid": "ec57aa06-17c8-4475-b4c2-3783f3c7ec7a"
} }
], ],
"network_mode": null, "network_mode": null,
@ -222,7 +232,7 @@
"stop_before_destroy": false, "stop_before_destroy": false,
"tags": null, "tags": null,
"timeouts": null, "timeouts": null,
"updated": "2023-11-23 11:32:45 +0000 UTC", "updated": "2023-12-01 16:17:28 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",
"vendor_options": [], "vendor_options": [],
"volume": [] "volume": []
@ -306,7 +316,7 @@
"default" "default"
], ],
"stop_before_destroy": false, "stop_before_destroy": false,
"tags": null, "tags": [],
"timeouts": null, "timeouts": null,
"updated": "2023-11-23 11:32:48 +0000 UTC", "updated": "2023-11-23 11:32:48 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",
@ -392,7 +402,7 @@
"default" "default"
], ],
"stop_before_destroy": false, "stop_before_destroy": false,
"tags": null, "tags": [],
"timeouts": null, "timeouts": null,
"updated": "2023-11-23 11:32:50 +0000 UTC", "updated": "2023-11-23 11:32:50 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",
@ -478,7 +488,7 @@
"default" "default"
], ],
"stop_before_destroy": false, "stop_before_destroy": false,
"tags": null, "tags": [],
"timeouts": null, "timeouts": null,
"updated": "2023-11-23 11:32:44 +0000 UTC", "updated": "2023-11-23 11:32:44 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d", "user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",

1
openstack-tf/d4s-dev/smart_executor_nodes/variables-dev.tf
View File

@ -1 +0,0 @@
../variables/variables-dev.tf

12
openstack-tf/modules/common_variables/variables.tf
View File

@ -353,3 +353,15 @@ variable "security_group_list" {
access_to_orientdb_se = "access_to_orientdb_se" access_to_orientdb_se = "access_to_orientdb_se"
} }
} }
variable "networks_list" {
type = map(string)
default = {
shared_postgresql = "postgresql-srv-net"
swarm = "swarm-nfs-net"
timescaledb = "timescaledb-net"
orientdb = "orientdb-net"
orientdb_se = "orientdb-se-net"
}
}

25
openstack-tf/modules/smart_executor_nodes/smart-executors.tf
View File

@ -3,7 +3,7 @@ resource "openstack_compute_instance_v2" "accounting_dashboard_harvester" {
name = var.accounting_dashboard_harvester.name name = var.accounting_dashboard_harvester.name
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
flavor_name = var.accounting_dashboard_harvester.flavor flavor_name = var.accounting_dashboard_harvester.flavor
key_pair = var.ssh_key_file.name key_pair = module.ssh_settings.ssh_key_name
security_groups = [var.default_security_group_name] security_groups = [var.default_security_group_name]
block_device { block_device {
uuid = var.ubuntu_1804.uuid uuid = var.ubuntu_1804.uuid
@ -17,10 +17,13 @@ resource "openstack_compute_instance_v2" "accounting_dashboard_harvester" {
name = var.main_private_network.name name = var.main_private_network.name
} }
network { network {
name = var.orientdb_se_net.network_name name = var.networks_list.orientdb_se
} }
network { network {
name = var.shared_postgresql_server_data.network_name name = var.networks_list.shared_postgresql
}
network {
name = var.networks_list.timescaledb
} }
user_data = "${file("${var.ubuntu1804_data_file}")}" user_data = "${file("${var.ubuntu1804_data_file}")}"
} }
@ -30,7 +33,7 @@ resource "openstack_compute_instance_v2" "resource_checker" {
name = var.resource_checker.name name = var.resource_checker.name
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
flavor_name = var.resource_checker.flavor flavor_name = var.resource_checker.flavor
key_pair = var.ssh_key_file.name key_pair = module.ssh_settings.ssh_key_name
security_groups = [var.default_security_group_name] security_groups = [var.default_security_group_name]
block_device { block_device {
uuid = var.ubuntu_1804.uuid uuid = var.ubuntu_1804.uuid
@ -44,7 +47,7 @@ resource "openstack_compute_instance_v2" "resource_checker" {
name = var.main_private_network.name name = var.main_private_network.name
} }
network { network {
name = var.orientdb_se_net.network_name name = var.networks_list.orientdb_se
} }
user_data = "${file("${var.ubuntu1804_data_file}")}" user_data = "${file("${var.ubuntu1804_data_file}")}"
} }
@ -54,7 +57,7 @@ resource "openstack_compute_instance_v2" "social_data_indexer" {
name = var.social_data_indexer.name name = var.social_data_indexer.name
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
flavor_name = var.social_data_indexer.flavor flavor_name = var.social_data_indexer.flavor
key_pair = var.ssh_key_file.name key_pair = module.ssh_settings.ssh_key_name
security_groups = [var.default_security_group_name] security_groups = [var.default_security_group_name]
block_device { block_device {
uuid = var.ubuntu_1804.uuid uuid = var.ubuntu_1804.uuid
@ -68,7 +71,7 @@ resource "openstack_compute_instance_v2" "social_data_indexer" {
name = var.main_private_network.name name = var.main_private_network.name
} }
network { network {
name = var.orientdb_se_net.network_name name = var.networks_list.orientdb_se
} }
user_data = "${file("${var.ubuntu1804_data_file}")}" user_data = "${file("${var.ubuntu1804_data_file}")}"
} }
@ -78,7 +81,7 @@ resource "openstack_compute_instance_v2" "accounting_insert_storage" {
name = var.accounting_insert_storage.name name = var.accounting_insert_storage.name
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
flavor_name = var.accounting_insert_storage.flavor flavor_name = var.accounting_insert_storage.flavor
key_pair = var.ssh_key_file.name key_pair = module.ssh_settings.ssh_key_name
security_groups = [var.default_security_group_name] security_groups = [var.default_security_group_name]
block_device { block_device {
uuid = var.ubuntu_1804.uuid uuid = var.ubuntu_1804.uuid
@ -92,7 +95,7 @@ resource "openstack_compute_instance_v2" "accounting_insert_storage" {
name = var.main_private_network.name name = var.main_private_network.name
} }
network { network {
name = var.orientdb_se_net.network_name name = var.networks_list.orientdb_se
} }
user_data = "${file("${var.ubuntu1804_data_file}")}" user_data = "${file("${var.ubuntu1804_data_file}")}"
} }
@ -102,7 +105,7 @@ resource "openstack_compute_instance_v2" "accounting_aggregator" {
name = var.accounting_aggregator.name name = var.accounting_aggregator.name
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
flavor_name = var.accounting_aggregator.flavor flavor_name = var.accounting_aggregator.flavor
key_pair = var.ssh_key_file.name key_pair = module.ssh_settings.ssh_key_name
security_groups = [var.default_security_group_name] security_groups = [var.default_security_group_name]
block_device { block_device {
uuid = var.ubuntu_1804.uuid uuid = var.ubuntu_1804.uuid
@ -116,7 +119,7 @@ resource "openstack_compute_instance_v2" "accounting_aggregator" {
name = var.main_private_network.name name = var.main_private_network.name
} }
network { network {
name = var.orientdb_se_net.network_name name = var.networks_list.orientdb_se
} }
user_data = "${file("${var.ubuntu1804_data_file}")}" user_data = "${file("${var.ubuntu1804_data_file}")}"
} }