Porting changes from upstream #2
|
|
@ -0,0 +1,30 @@
|
||||||
|
# Define required providers
|
||||||
|
terraform {
|
||||||
|
required_version = ">= 0.14.0"
|
||||||
|
required_providers {
|
||||||
|
openstack = {
|
||||||
|
source = "terraform-provider-openstack/openstack"
|
||||||
|
version = "~> 1.53.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data "terraform_remote_state" "privnet_dns_router" {
|
||||||
|
backend = "local"
|
||||||
|
|
||||||
|
config = {
|
||||||
|
path = "../project-setup/terraform.tfstate"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module "common_variables" {
|
||||||
|
source = "../../modules/common_variables"
|
||||||
|
}
|
||||||
|
|
||||||
|
module "variables" {
|
||||||
|
source = "../variables"
|
||||||
|
}
|
||||||
|
|
||||||
|
module "ssh_keys" {
|
||||||
|
source = "../../modules/ssh_keys"
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
provider "openstack" {
|
||||||
|
cloud = "d4s-dev"
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,429 @@
|
||||||
|
{
|
||||||
|
"version": 4,
|
||||||
|
"terraform_version": "1.7.4",
|
||||||
|
"serial": 3,
|
||||||
|
"lineage": "48e9b647-6c03-4b28-7033-9e1d40b3795d",
|
||||||
|
"outputs": {},
|
||||||
|
"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.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",
|
||||||
|
"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",
|
||||||
|
"c2_large": "c2.large",
|
||||||
|
"m1_large": "m1.large",
|
||||||
|
"m1_medium": "m1.medium",
|
||||||
|
"m1_xlarge": "m1.xlarge",
|
||||||
|
"m1_xxl": "m1.xxl",
|
||||||
|
"m2_large": "m2.large",
|
||||||
|
"m2_medium": "m2.medium",
|
||||||
|
"m2_small": "m2.small",
|
||||||
|
"m3_large": "m3.large"
|
||||||
|
},
|
||||||
|
"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_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": {
|
||||||
|
"cassandra": "cassandra-net",
|
||||||
|
"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"
|
||||||
|
},
|
||||||
|
"nfs_share_no_ingress_secgroup_id": "5887da8d-e362-4509-93ac-8a70bf8baef9",
|
||||||
|
"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.28.103/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",
|
||||||
|
"nfs_share_no_ingress": "nfs_share_no_ingress",
|
||||||
|
"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"
|
||||||
|
},
|
||||||
|
"storage_nfs_network_id": "5f4023cc-4016-404c-94e5-86220095fbaf",
|
||||||
|
"storage_nfs_subnet_id": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696",
|
||||||
|
"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"
|
||||||
|
],
|
||||||
|
"nfs_share_no_ingress_secgroup_id": "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"
|
||||||
|
],
|
||||||
|
"storage_nfs_network_id": "string",
|
||||||
|
"storage_nfs_subnet_id": "string",
|
||||||
|
"ubuntu1804_data_file": "string",
|
||||||
|
"ubuntu2204_data_file": "string",
|
||||||
|
"ubuntu_1804": [
|
||||||
|
"map",
|
||||||
|
"string"
|
||||||
|
],
|
||||||
|
"ubuntu_2204": [
|
||||||
|
"map",
|
||||||
|
"string"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"workspace": null
|
||||||
|
},
|
||||||
|
"sensitive_attributes": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"module": "module.ssh_keys",
|
||||||
|
"mode": "managed",
|
||||||
|
"type": "openstack_compute_keypair_v2",
|
||||||
|
"name": "initial_ssh_key",
|
||||||
|
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
|
||||||
|
"instances": [
|
||||||
|
{
|
||||||
|
"schema_version": 0,
|
||||||
|
"attributes": {
|
||||||
|
"fingerprint": "c8:e0:f5:3d:5b:31:5e:f0:bf:e2:d6:b7:e5:1b:8a:6a",
|
||||||
|
"id": "Marco Procaccini",
|
||||||
|
"name": "Marco Procaccini",
|
||||||
|
"private_key": "",
|
||||||
|
"public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCWabEzyFoWbwIkxq3Y9GF2VuRAfglZZxDwvyRgQEAeohF0ue+whk9fN91gI58hW8hEiW3RBt6R1Stp9Gk9lTzKpqtP591A0UsStGTt7D2cXbOS+X2Hj3uAeKwYmtV2AB4l5xzEluK2adWBSBpMZW+pqSjd6ifLR0TsiRcZ9LSaoa3aAqxv55pmeVrlETi9qMvJi083g72LOO/8k02Ea1VAstBoJ1niyaQ69sqVZDTvUSsjjUSla1AxA2cAS/5wjhHOlcuRdxqxuEmqYaCgexmKcRUYoFOWYnYU2iHgi9Ksg2NEr4tn6tQnNKlk7qD3OgIgoyGKhwOxq/Vap5nlO/DGJ6eQbGoK+27SqV9QrM8bj4Et23diTCfUfS96OyLGBjRYAPG50POUtpgXfn/RjhGS8rX4QMKM0ZysAWFAxUMDNFobE9ieXNTrLFh4f9cpVKN0aGooBak4gAdKiAwdqv+Q3DGrBYoz0m7crKUN/hWdXq57B2FaJUVTf/rIzK+cThE= marco@procpc\n",
|
||||||
|
"region": "isti_area_pi_1",
|
||||||
|
"user_id": "",
|
||||||
|
"value_specs": null
|
||||||
|
},
|
||||||
|
"sensitive_attributes": [
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"type": "get_attr",
|
||||||
|
"value": "public_key"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
],
|
||||||
|
"private": "bnVsbA=="
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"check_results": null
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue