Merging from upstream #1
|
|
@ -100,7 +100,7 @@ variable "octavia_information" {
|
|||
# The following aren't available when the module runs so we have to get them with the command
|
||||
# openstack --os-cloud d4s-pre port list -f value | grep octavia-lb-vrrp
|
||||
# This means that the execution will fail
|
||||
octavia_vrrp_ip_1 = "10.1.33.159/32"
|
||||
octavia_vrrp_ip_2 = "10.1.32.199/32"
|
||||
octavia_vrrp_ip_1 = "10.1.32.0/22"
|
||||
octavia_vrrp_ip_2 = "10.1.32.0/22"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,3 +12,15 @@ terraform {
|
|||
provider "openstack" {
|
||||
cloud = "d4s-production"
|
||||
}
|
||||
|
||||
data "terraform_remote_state" "privnet_dns_router" {
|
||||
backend = "local"
|
||||
|
||||
config = {
|
||||
path = "../project-setup/terraform.tfstate"
|
||||
}
|
||||
}
|
||||
|
||||
module "ssh_settings" {
|
||||
source = "../../modules/ssh-key-ref"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": 4,
|
||||
"terraform_version": "1.6.3",
|
||||
"serial": 330,
|
||||
"terraform_version": "1.6.6",
|
||||
"serial": 372,
|
||||
"lineage": "954b57a1-c68e-fa2b-cf2f-79cc54aea13e",
|
||||
"outputs": {
|
||||
"main_loadbalancer_ip": {
|
||||
|
|
@ -14,6 +14,384 @@
|
|||
}
|
||||
},
|
||||
"resources": [
|
||||
{
|
||||
"mode": "data",
|
||||
"type": "terraform_remote_state",
|
||||
"name": "privnet_dns_router",
|
||||
"provider": "provider[\"terraform.io/builtin/terraform\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"backend": "local",
|
||||
"config": {
|
||||
"value": {
|
||||
"path": "../project-setup/terraform.tfstate"
|
||||
},
|
||||
"type": [
|
||||
"object",
|
||||
{
|
||||
"path": "string"
|
||||
}
|
||||
]
|
||||
},
|
||||
"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.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"
|
||||
},
|
||||
"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-production-cloud project",
|
||||
"email": "postmaster@isti.cnr.it",
|
||||
"ttl": "8600",
|
||||
"zone_name": "cloud.d4science.org."
|
||||
},
|
||||
"dns_zone_id": "74135b34-1a9c-4c01-8cf0-22450a5660c4",
|
||||
"el7_data_file": "../../openstack_vm_data_scripts/el7.sh",
|
||||
"external_gateway_ip": [
|
||||
{
|
||||
"ip_address": "146.48.31.57",
|
||||
"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 Production main router",
|
||||
"id": "cc26064a-bb08-4c0b-929f-d0cb39f934a3",
|
||||
"name": "d4s-production-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.40.11",
|
||||
"10.1.40.12"
|
||||
],
|
||||
"main_private_network": {
|
||||
"description": "D4Science Production private network (use this as the main network)",
|
||||
"name": "d4s-production-cloud-main"
|
||||
},
|
||||
"main_private_network_id": "020df98d-ae72-452a-b376-3b6dc289acac",
|
||||
"main_private_subnet": {
|
||||
"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"
|
||||
},
|
||||
"main_region": "isti_area_pi_1",
|
||||
"main_subnet_network_id": "5d7b83ad-e058-4a3a-bfd8-d20ba6d42e1a",
|
||||
"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 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",
|
||||
"swarm_lb_name": "d4s-production-cloud-l4-swarm-load-balancer"
|
||||
},
|
||||
"os_project_data": {
|
||||
"id": "1b45adf388934758b56d0dfdb4bfacf3"
|
||||
},
|
||||
"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": "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",
|
||||
"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",
|
||||
"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_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"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"workspace": null
|
||||
},
|
||||
"sensitive_attributes": []
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_blockstorage_volume_v3",
|
||||
|
|
@ -192,7 +570,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_instance_v2.prometheus_server",
|
||||
"openstack_networking_floatingip_v2.prometheus_server_ip",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.prometheus_access_from_grafana",
|
||||
"openstack_networking_secgroup_v2.restricted_web"
|
||||
]
|
||||
|
|
@ -221,8 +598,7 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_instance_v2.ssh_jump_proxy",
|
||||
"openstack_networking_floatingip_v2.ssh_jump_proxy_ip",
|
||||
"openstack_networking_secgroup_v2.access_to_the_jump_proxy",
|
||||
"openstack_networking_secgroup_v2.default"
|
||||
"openstack_networking_secgroup_v2.access_to_the_jump_proxy"
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
@ -671,7 +1047,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:57:32 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -680,7 +1056,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -782,7 +1157,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:50:38 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -791,7 +1166,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -893,7 +1267,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:57:33 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -902,7 +1276,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -1004,7 +1377,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:50:34 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -1013,7 +1386,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -1115,7 +1487,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:50:26 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -1124,7 +1496,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -1226,7 +1597,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:50:45 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -1235,7 +1606,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -1337,7 +1707,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:50:39 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -1346,7 +1716,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -1448,7 +1817,7 @@
|
|||
"tags": [],
|
||||
"timeouts": null,
|
||||
"updated": "2023-11-06 18:50:37 +0000 UTC",
|
||||
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",
|
||||
"user_data": "",
|
||||
"vendor_options": [],
|
||||
"volume": []
|
||||
},
|
||||
|
|
@ -1457,7 +1826,6 @@
|
|||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.swarm_workers",
|
||||
"openstack_networking_network_v2.swarm_nfs_net",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.swarm_internal_traffic",
|
||||
"openstack_networking_subnet_v2.swarm_nfs_subnet"
|
||||
]
|
||||
|
|
@ -1536,10 +1904,7 @@
|
|||
"volume": []
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
|
||||
"dependencies": [
|
||||
"openstack_networking_secgroup_v2.default"
|
||||
]
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -1631,7 +1996,6 @@
|
|||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
|
||||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.main_haproxy_l7",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.main_lb_to_haproxy_l7"
|
||||
]
|
||||
},
|
||||
|
|
@ -1717,7 +2081,6 @@
|
|||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
|
||||
"dependencies": [
|
||||
"openstack_compute_servergroup_v2.main_haproxy_l7",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.main_lb_to_haproxy_l7"
|
||||
]
|
||||
}
|
||||
|
|
@ -1799,7 +2162,6 @@
|
|||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
|
||||
"dependencies": [
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.prometheus_access_from_grafana",
|
||||
"openstack_networking_secgroup_v2.restricted_web"
|
||||
]
|
||||
|
|
@ -1891,7 +2253,6 @@
|
|||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
|
||||
"dependencies": [
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.shared_postgresql_access"
|
||||
]
|
||||
}
|
||||
|
|
@ -1972,8 +2333,7 @@
|
|||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
|
||||
"dependencies": [
|
||||
"openstack_networking_secgroup_v2.access_to_the_jump_proxy",
|
||||
"openstack_networking_secgroup_v2.default"
|
||||
"openstack_networking_secgroup_v2.access_to_the_jump_proxy"
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
@ -2194,7 +2554,6 @@
|
|||
"dependencies": [
|
||||
"openstack_blockstorage_volume_v3.prometheus_data_vol",
|
||||
"openstack_compute_instance_v2.prometheus_server",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.prometheus_access_from_grafana",
|
||||
"openstack_networking_secgroup_v2.restricted_web"
|
||||
]
|
||||
|
|
@ -2224,7 +2583,6 @@
|
|||
"dependencies": [
|
||||
"openstack_blockstorage_volume_v3.shared_postgresql_backup_vol",
|
||||
"openstack_compute_instance_v2.shared_postgresql_server",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.shared_postgresql_access"
|
||||
]
|
||||
}
|
||||
|
|
@ -2253,7 +2611,6 @@
|
|||
"dependencies": [
|
||||
"openstack_blockstorage_volume_v3.shared_postgresql_data_vol",
|
||||
"openstack_compute_instance_v2.shared_postgresql_server",
|
||||
"openstack_networking_secgroup_v2.default",
|
||||
"openstack_networking_secgroup_v2.shared_postgresql_access"
|
||||
]
|
||||
}
|
||||
|
|
@ -4431,7 +4788,7 @@
|
|||
"description": "Peer traffic from haproxy l7 1 to l7 2",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "c35a41fe-113d-41a4-beb8-d0670633b844",
|
||||
"id": "94178794-f726-48d5-9df3-b135ee8c9d42",
|
||||
"port_range_max": 10000,
|
||||
"port_range_min": 10000,
|
||||
"protocol": "tcp",
|
||||
|
|
@ -4462,7 +4819,7 @@
|
|||
"description": "Peer traffic from haproxy l7 2 to l7 1",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "bac8b398-ed17-4757-9b08-d33f7c87d9f3",
|
||||
"id": "dd2ad153-318b-4ed0-acac-47338e9465ef",
|
||||
"port_range_max": 10000,
|
||||
"port_range_min": 10000,
|
||||
"protocol": "tcp",
|
||||
|
|
@ -4701,22 +5058,22 @@
|
|||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_networking_secgroup_rule_v2",
|
||||
"name": "lb3_1_haproxy_l7_443",
|
||||
"name": "octavia_to_haproxy_l7_443",
|
||||
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"description": "Traffic from the first main lb instance to HAPROXY l7 1 port 443",
|
||||
"description": "Traffic from the octavia lb instance to HAPROXY l7 port 443",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "4e1de285-2973-4743-abba-f418e4f0feb9",
|
||||
"id": "1e7bc675-f8ba-48bc-97a6-14838a011860",
|
||||
"port_range_max": 443,
|
||||
"port_range_min": 443,
|
||||
"protocol": "tcp",
|
||||
"region": "isti_area_pi_1",
|
||||
"remote_group_id": "",
|
||||
"remote_ip_prefix": "10.1.42.119/32",
|
||||
"remote_ip_prefix": "10.1.40.0/21",
|
||||
"security_group_id": "0c3bdb0a-5f5a-4272-b479-285480543c68",
|
||||
"tenant_id": "1b45adf388934758b56d0dfdb4bfacf3",
|
||||
"timeouts": null
|
||||
|
|
@ -4732,22 +5089,22 @@
|
|||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_networking_secgroup_rule_v2",
|
||||
"name": "lb3_1_haproxy_l7_80",
|
||||
"name": "octavia_to_haproxy_l7_80",
|
||||
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"description": "Traffic from the first main lb instance to HAPROXY l7 1 port 80",
|
||||
"description": "Traffic from the octavia lb instance to HAPROXY l7 port 80",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "997d9a2a-facc-44c1-8527-5649fa76981b",
|
||||
"id": "e6734f61-c4da-4399-9d48-85421b9e66f1",
|
||||
"port_range_max": 80,
|
||||
"port_range_min": 80,
|
||||
"protocol": "tcp",
|
||||
"region": "isti_area_pi_1",
|
||||
"remote_group_id": "",
|
||||
"remote_ip_prefix": "10.1.42.119/32",
|
||||
"remote_ip_prefix": "10.1.40.0/21",
|
||||
"security_group_id": "0c3bdb0a-5f5a-4272-b479-285480543c68",
|
||||
"tenant_id": "1b45adf388934758b56d0dfdb4bfacf3",
|
||||
"timeouts": null
|
||||
|
|
@ -4763,115 +5120,22 @@
|
|||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_networking_secgroup_rule_v2",
|
||||
"name": "lb3_1_haproxy_l7_8080",
|
||||
"name": "octavia_to_haproxy_l7_8880",
|
||||
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"description": "Traffic from the first main lb instance to HAPROXY l7 1 port 8080",
|
||||
"description": "Traffic from the octavia lb instance to HAPROXY l7 port 8880",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "2c704ff2-eda0-4ea6-a839-d1f289b7e8d8",
|
||||
"port_range_max": 8080,
|
||||
"port_range_min": 8080,
|
||||
"id": "32e435ed-ee13-4e2e-addb-9bc141fd2640",
|
||||
"port_range_max": 8880,
|
||||
"port_range_min": 8880,
|
||||
"protocol": "tcp",
|
||||
"region": "isti_area_pi_1",
|
||||
"remote_group_id": "",
|
||||
"remote_ip_prefix": "10.1.42.119/32",
|
||||
"security_group_id": "0c3bdb0a-5f5a-4272-b479-285480543c68",
|
||||
"tenant_id": "1b45adf388934758b56d0dfdb4bfacf3",
|
||||
"timeouts": null
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjo2MDAwMDAwMDAwMDB9fQ==",
|
||||
"dependencies": [
|
||||
"openstack_networking_secgroup_v2.main_lb_to_haproxy_l7"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_networking_secgroup_rule_v2",
|
||||
"name": "lb3_2_haproxy_l7_443",
|
||||
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"description": "Traffic from the first main lb instance to HAPROXY l7 2 port 443",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "c52aca74-7d2d-4d67-a344-465be1e5fb45",
|
||||
"port_range_max": 443,
|
||||
"port_range_min": 443,
|
||||
"protocol": "tcp",
|
||||
"region": "isti_area_pi_1",
|
||||
"remote_group_id": "",
|
||||
"remote_ip_prefix": "10.1.42.188/32",
|
||||
"security_group_id": "0c3bdb0a-5f5a-4272-b479-285480543c68",
|
||||
"tenant_id": "1b45adf388934758b56d0dfdb4bfacf3",
|
||||
"timeouts": null
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjo2MDAwMDAwMDAwMDB9fQ==",
|
||||
"dependencies": [
|
||||
"openstack_networking_secgroup_v2.main_lb_to_haproxy_l7"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_networking_secgroup_rule_v2",
|
||||
"name": "lb3_2_haproxy_l7_80",
|
||||
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"description": "Traffic from the first main lb instance to HAPROXY l7 2 port 80",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "69f42ddc-c9aa-4a91-b720-16fb62c68b72",
|
||||
"port_range_max": 80,
|
||||
"port_range_min": 80,
|
||||
"protocol": "tcp",
|
||||
"region": "isti_area_pi_1",
|
||||
"remote_group_id": "",
|
||||
"remote_ip_prefix": "10.1.42.188/32",
|
||||
"security_group_id": "0c3bdb0a-5f5a-4272-b479-285480543c68",
|
||||
"tenant_id": "1b45adf388934758b56d0dfdb4bfacf3",
|
||||
"timeouts": null
|
||||
},
|
||||
"sensitive_attributes": [],
|
||||
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjo2MDAwMDAwMDAwMDB9fQ==",
|
||||
"dependencies": [
|
||||
"openstack_networking_secgroup_v2.main_lb_to_haproxy_l7"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"mode": "managed",
|
||||
"type": "openstack_networking_secgroup_rule_v2",
|
||||
"name": "lb3_2_haproxy_l7_8080",
|
||||
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||
"instances": [
|
||||
{
|
||||
"schema_version": 0,
|
||||
"attributes": {
|
||||
"description": "Traffic from the first main lb instance to HAPROXY l7 2 port 8080",
|
||||
"direction": "ingress",
|
||||
"ethertype": "IPv4",
|
||||
"id": "b4ba8d1e-4851-4474-b48d-b7f6b5a17e0d",
|
||||
"port_range_max": 8080,
|
||||
"port_range_min": 8080,
|
||||
"protocol": "tcp",
|
||||
"region": "isti_area_pi_1",
|
||||
"remote_group_id": "",
|
||||
"remote_ip_prefix": "10.1.42.188/32",
|
||||
"remote_ip_prefix": "10.1.40.0/21",
|
||||
"security_group_id": "0c3bdb0a-5f5a-4272-b479-285480543c68",
|
||||
"tenant_id": "1b45adf388934758b56d0dfdb4bfacf3",
|
||||
"timeouts": null
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
variable "dns_zone_id" {
|
||||
default = "74135b34-1a9c-4c01-8cf0-22450a5660c4"
|
||||
}
|
||||
|
||||
variable "main_private_network_id" {
|
||||
default = "020df98d-ae72-452a-b376-3b6dc289acac"
|
||||
}
|
||||
|
||||
variable "main_private_subnet_id" {
|
||||
default = "5d7b83ad-e058-4a3a-bfd8-d20ba6d42e1a"
|
||||
}
|
||||
|
|
@ -42,73 +42,42 @@ resource "openstack_networking_secgroup_rule_v2" "haproxy_l7_2_peer" {
|
|||
remote_ip_prefix = var.basic_services_ip.haproxy_l7_2_cidr
|
||||
}
|
||||
|
||||
resource "openstack_networking_secgroup_rule_v2" "lb3_1_haproxy_l7_80" {
|
||||
resource "openstack_networking_secgroup_rule_v2" "octavia_to_haproxy_l7_80" {
|
||||
security_group_id = openstack_networking_secgroup_v2.main_lb_to_haproxy_l7.id
|
||||
description = "Traffic from the first main lb instance to HAPROXY l7 1 port 80"
|
||||
description = "Traffic from the octavia lb instance to HAPROXY l7 port 80"
|
||||
direction = "ingress"
|
||||
ethertype = "IPv4"
|
||||
protocol = "tcp"
|
||||
port_range_min = 80
|
||||
port_range_max = 80
|
||||
remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_1
|
||||
# remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_1
|
||||
remote_ip_prefix = var.main_private_subnet.cidr
|
||||
}
|
||||
|
||||
resource "openstack_networking_secgroup_rule_v2" "lb3_1_haproxy_l7_443" {
|
||||
resource "openstack_networking_secgroup_rule_v2" "octavia_to_haproxy_l7_443" {
|
||||
security_group_id = openstack_networking_secgroup_v2.main_lb_to_haproxy_l7.id
|
||||
description = "Traffic from the first main lb instance to HAPROXY l7 1 port 443"
|
||||
description = "Traffic from the octavia lb instance to HAPROXY l7 port 443"
|
||||
direction = "ingress"
|
||||
ethertype = "IPv4"
|
||||
protocol = "tcp"
|
||||
port_range_min = 443
|
||||
port_range_max = 443
|
||||
remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_1
|
||||
# remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_1
|
||||
remote_ip_prefix = var.main_private_subnet.cidr
|
||||
}
|
||||
|
||||
resource "openstack_networking_secgroup_rule_v2" "lb3_1_haproxy_l7_8080" {
|
||||
resource "openstack_networking_secgroup_rule_v2" "octavia_to_haproxy_l7_8880" {
|
||||
security_group_id = openstack_networking_secgroup_v2.main_lb_to_haproxy_l7.id
|
||||
description = "Traffic from the first main lb instance to HAPROXY l7 1 port 8080"
|
||||
description = "Traffic from the octavia lb instance to HAPROXY l7 port 8880"
|
||||
direction = "ingress"
|
||||
ethertype = "IPv4"
|
||||
protocol = "tcp"
|
||||
port_range_min = 8080
|
||||
port_range_max = 8080
|
||||
remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_1
|
||||
port_range_min = 8880
|
||||
port_range_max = 8880
|
||||
# remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_1
|
||||
remote_ip_prefix = var.main_private_subnet.cidr
|
||||
}
|
||||
|
||||
resource "openstack_networking_secgroup_rule_v2" "lb3_2_haproxy_l7_80" {
|
||||
security_group_id = openstack_networking_secgroup_v2.main_lb_to_haproxy_l7.id
|
||||
description = "Traffic from the first main lb instance to HAPROXY l7 2 port 80"
|
||||
direction = "ingress"
|
||||
ethertype = "IPv4"
|
||||
protocol = "tcp"
|
||||
port_range_min = 80
|
||||
port_range_max = 80
|
||||
remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_2
|
||||
}
|
||||
|
||||
resource "openstack_networking_secgroup_rule_v2" "lb3_2_haproxy_l7_443" {
|
||||
security_group_id = openstack_networking_secgroup_v2.main_lb_to_haproxy_l7.id
|
||||
description = "Traffic from the first main lb instance to HAPROXY l7 2 port 443"
|
||||
direction = "ingress"
|
||||
ethertype = "IPv4"
|
||||
protocol = "tcp"
|
||||
port_range_min = 443
|
||||
port_range_max = 443
|
||||
remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_2
|
||||
}
|
||||
|
||||
resource "openstack_networking_secgroup_rule_v2" "lb3_2_haproxy_l7_8080" {
|
||||
security_group_id = openstack_networking_secgroup_v2.main_lb_to_haproxy_l7.id
|
||||
description = "Traffic from the first main lb instance to HAPROXY l7 2 port 8080"
|
||||
direction = "ingress"
|
||||
ethertype = "IPv4"
|
||||
protocol = "tcp"
|
||||
port_range_min = 8080
|
||||
port_range_max = 8080
|
||||
remote_ip_prefix = var.octavia_information.octavia_vrrp_ip_2
|
||||
}
|
||||
|
||||
|
||||
# Instance
|
||||
resource "openstack_compute_instance_v2" "main_haproxy_l7" {
|
||||
count = var.haproxy_l7_data.vm_count
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ resource "openstack_compute_instance_v2" "docker_swarm_managers" {
|
|||
name = format("%s-%02d", var.docker_swarm_data.mgr_name, count.index + 1)
|
||||
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
|
||||
flavor_name = var.docker_swarm_data.mgr_flavor
|
||||
key_pair = var.ssh_key_file.name
|
||||
key_pair = module.ssh_settings.ssh_key_name
|
||||
security_groups = [openstack_networking_secgroup_v2.default.name, openstack_networking_secgroup_v2.swarm_internal_traffic.name]
|
||||
scheduler_hints {
|
||||
group = openstack_compute_servergroup_v2.swarm_masters.id
|
||||
|
|
@ -144,8 +144,8 @@ resource "openstack_compute_instance_v2" "docker_swarm_workers" {
|
|||
name = format("%s-%02d", var.docker_swarm_data.worker_name, count.index + 1)
|
||||
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
|
||||
flavor_name = var.docker_swarm_data.worker_flavor
|
||||
key_pair = var.ssh_key_file.name
|
||||
security_groups = [openstack_networking_secgroup_v2.default.name, openstack_networking_secgroup_v2.swarm_internal_traffic.name]
|
||||
key_pair = module.ssh_settings.ssh_key_name
|
||||
security_groups = [var.default_security_group_name, openstack_networking_secgroup_v2.swarm_internal_traffic.name]
|
||||
scheduler_hints {
|
||||
group = openstack_compute_servergroup_v2.swarm_workers.id
|
||||
}
|
||||
|
|
@ -183,7 +183,7 @@ resource "openstack_compute_instance_v2" "docker_swarm_workers" {
|
|||
ignore_changes = [
|
||||
# Ignore changes to tags, e.g. because a management agent
|
||||
# updates these based on some ruleset managed elsewhere.
|
||||
key_pair, user_data
|
||||
key_pair, user_data, network
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -200,7 +200,7 @@ resource "openstack_compute_instance_v2" "swarm_nfs_server" {
|
|||
name = var.docker_swarm_data.nfs_server_name
|
||||
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
|
||||
flavor_name = var.docker_swarm_data.nfs_server_flavor
|
||||
key_pair = var.ssh_key_file.name
|
||||
key_pair = module.ssh_settings.ssh_key_name
|
||||
security_groups = [openstack_networking_secgroup_v2.default.name, openstack_networking_secgroup_v2.swarm_nfs_traffic.name]
|
||||
block_device {
|
||||
uuid = var.ubuntu_2204.uuid
|
||||
|
|
|
|||
Loading…
Reference in New Issue