mauro.mugnaini
/
infrastructure-as-code
forked from InfraScience/infrastructure-as-code
1
0
Fork 0
Code Pull Requests Activity

Porting changes from upstream #2

Merged
mauro.mugnaini merged 104 commits from InfraScience/infrastructure-as-code:main into main 2024-03-20 12:31:43 +01:00
Conversation 0 Commits 104 Files Changed 152 +2860 -6
4 changed files with 2860 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64f78b2ca5 - Show all commits

2805
openstack-tf/d4s-production/basic-infrastructure/terraform.tfstate
View File

File diff suppressed because it is too large Load Diff

8
openstack-tf/d4s-production/gcore-services/main.tf
View File

@ -91,6 +91,14 @@ module "dns_records_create" {
type = "CNAME" type = "CNAME"
records = [local.cname_target] records = [local.cname_target]
}, },
resourcemanager-root = {
zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
name = join(".", ["resourcemanager-root", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
description = "gCore resourcemanager-root"
ttl = 8600
type = "CNAME"
records = [local.cname_target]
},
vremodeler-gcubeapps = { vremodeler-gcubeapps = {
zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
name = join(".", ["vremodeler-gcubeapps", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name]) name = join(".", ["vremodeler-gcubeapps", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])

42
openstack-tf/d4s-production/gcore-services/terraform.tfstate
View File

@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.6.6", "terraform_version": "1.6.6",
"serial": 14, "serial": 16,
"lineage": "0f20c78f-bcfa-7a96-7a73-cabf9dc181bf", "lineage": "0f20c78f-bcfa-7a96-7a73-cabf9dc181bf",
"outputs": {}, "outputs": {},
"resources": [ "resources": [
@ -86,12 +86,15 @@
"c1_large": "c1.large", "c1_large": "c1.large",
"c1_medium": "c1.medium", "c1_medium": "c1.medium",
"c1_small": "c1.small", "c1_small": "c1.small",
"c2_large": "c2.large",
"m1_large": "m1.large", "m1_large": "m1.large",
"m1_medium": "m1.medium", "m1_medium": "m1.medium",
"m1_xlarge": "m1.xlarge", "m1_xlarge": "m1.xlarge",
"m1_xxl": "m1.xxl",
"m2_large": "m2.large", "m2_large": "m2.large",
"m2_medium": "m2.medium", "m2_medium": "m2.medium",
"m2_small": "m2.small" "m2_small": "m2.small",
"m3_large": "m3.large"
}, },
"floating_ip_pools": { "floating_ip_pools": {
"main_public_ip_pool": "external-network" "main_public_ip_pool": "external-network"
@ -128,6 +131,7 @@
"main_subnet_network_id": "5d7b83ad-e058-4a3a-bfd8-d20ba6d42e1a", "main_subnet_network_id": "5d7b83ad-e058-4a3a-bfd8-d20ba6d42e1a",
"mtu_size": 8942, "mtu_size": 8942,
"networks_list": { "networks_list": {
"cassandra": "cassandra-net",
"orientdb": "orientdb-net", "orientdb": "orientdb-net",
"orientdb_se": "orientdb-se-net", "orientdb_se": "orientdb-se-net",
"shared_postgresql": "postgresql-srv-net", "shared_postgresql": "postgresql-srv-net",
@ -142,6 +146,7 @@
"isti_net": "146.48.80.0/21", "isti_net": "146.48.80.0/21",
"s2i2s_net": "146.48.28.0/22" "s2i2s_net": "146.48.28.0/22"
}, },
"nfs_share_no_ingress_secgroup_id": "167e4897-f776-4cbd-986f-77313aa68af2",
"octavia_information": { "octavia_information": {
"main_lb_description": "Main L4 load balancer for the D4Science production", "main_lb_description": "Main L4 load balancer for the D4Science production",
"main_lb_hostname": "main-lb", "main_lb_hostname": "main-lb",
@ -162,7 +167,7 @@
"prometheus_server_data": { "prometheus_server_data": {
"flavor": "m1.medium", "flavor": "m1.medium",
"name": "prometheus", "name": "prometheus",
"public_grafana_server_cidr": "146.48.122.132/32", "public_grafana_server_cidr": "146.48.28.103/32",
"vol_data_device": "/dev/vdb", "vol_data_device": "/dev/vdb",
"vol_data_name": "prometheus-data", "vol_data_name": "prometheus-data",
"vol_data_size": "100" "vol_data_size": "100"
@ -189,6 +194,7 @@
"limited_HTTPS_access": "restricted_web_service", "limited_HTTPS_access": "restricted_web_service",
"limited_SSH_access": "Limited SSH access", "limited_SSH_access": "Limited SSH access",
"mongo": "mongo", "mongo": "mongo",
"nfs_share_no_ingress": "nfs_share_no_ingress",
"orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic", "orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic",
"postgreSQL": "PostgreSQL service", "postgreSQL": "PostgreSQL service",
"public_HTTPS": "Public HTTPS" "public_HTTPS": "Public HTTPS"
@ -220,6 +226,8 @@
"s2i2s_vpn_2_cidr": "146.48.28.11/32", "s2i2s_vpn_2_cidr": "146.48.28.11/32",
"shell_d4s_cidr": "146.48.122.95/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", "ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh",
"ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", "ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh",
"ubuntu_1804": { "ubuntu_1804": {
@ -320,6 +328,7 @@
"map", "map",
"string" "string"
], ],
"nfs_share_no_ingress_secgroup_id": "string",
"octavia_information": [ "octavia_information": [
"map", "map",
"string" "string"
@ -364,6 +373,8 @@
"map", "map",
"string" "string"
], ],
"storage_nfs_network_id": "string",
"storage_nfs_subnet_id": "string",
"ubuntu1804_data_file": "string", "ubuntu1804_data_file": "string",
"ubuntu2204_data_file": "string", "ubuntu2204_data_file": "string",
"ubuntu_1804": [ "ubuntu_1804": [
@ -540,6 +551,31 @@
"data.terraform_remote_state.privnet_dns_router" "data.terraform_remote_state.privnet_dns_router"
] ]
}, },
{
"index_key": "resourcemanager-root",
"schema_version": 0,
"attributes": {
"description": "gCore resourcemanager-root",
"disable_status_check": false,
"id": "74135b34-1a9c-4c01-8cf0-22450a5660c4/f87bd713-bbe1-4054-8781-82183cf2ed83",
"name": "resourcemanager-root.cloud.d4science.org.",
"project_id": "1b45adf388934758b56d0dfdb4bfacf3",
"records": [
"swarm-lb.cloud.d4science.org."
],
"region": "isti_area_pi_1",
"timeouts": null,
"ttl": 8600,
"type": "CNAME",
"value_specs": null,
"zone_id": "74135b34-1a9c-4c01-8cf0-22450a5660c4"
},
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
"dependencies": [
"data.terraform_remote_state.privnet_dns_router"
]
},
{ {
"index_key": "resourcemanager-sobigdata", "index_key": "resourcemanager-sobigdata",
"schema_version": 0, "schema_version": 0,

11
openstack-tf/modules/docker_swarm/docker-swarm.tf
View File

@ -530,3 +530,14 @@ output "swarm_loadbalancer_ip" {
value = openstack_lb_loadbalancer_v2.swarm_lb.vip_address value = openstack_lb_loadbalancer_v2.swarm_lb.vip_address
} }
output "swarm_manager_nodes" {
description = "Docker Swarm Manager nodes data"
value = openstack_compute_instance_v2.docker_swarm_managers
sensitive = true
}
output "swarm_worker_nodes" {
description = "Docker Swarm Worker nodes data"
value = openstack_compute_instance_v2.docker_swarm_workers
sensitive = true
}