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

The production project-setup now uses modules.

This commit is contained in:
Andrea Dell'Amico 2023-12-11 18:16:52 +01:00
parent db59cf45a1
commit 9a87860105
Signed by: andrea.dellamico
GPG Key ID: 147ABE6CEB9E20FF
6 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
openstack-tf/d4s-production/project-setup/main.tf
View File

@ -9,12 +9,37 @@ required_version = ">= 0.14.0"
}
}
# SSH settings
module "ssh_settings" {
source = "../../modules/ssh-key-ref"
}
provider "openstack" {
cloud = "d4s-production"
# cloud = "ISTI-Cloud"
}
# Main module
module "main_private_net_and_dns_zone" {
source = "../../modules/main_private_net_and_dns_zone"
dns_zone = {
zone_name = "cloud.d4science.org."
email = "postmaster@isti.cnr.it"
description = "DNS primary zone for the d4s-production-cloud project"
ttl = 8600
}
os_project_data = {
id = "1b45adf388934758b56d0dfdb4bfacf3"
}
main_private_network = {
name = "d4s-production-cloud-main"
description = "D4Science Production private network (use this as the main network)"
}
main_private_subnet = {
name = "d4s-production-cloud-main-subnet"
description = "D4Science Production main private subnet"
cidr = "10.1.40.0/21"
gateway_ip = "10.1.40.1"
allocation_start = "10.1.41.100"
allocation_end = "10.1.47.254"
}
external_router = {
name = "d4s-production-cloud-external-router"
description = "D4Science Production main router"
}
}

1
openstack-tf/d4s-production/project-setup/main_network_dns_zone.tf
View File

@ -1 +0,0 @@
../../modules/main_private_net_and_dns_zone/main_network_dns_zone.tf

1
openstack-tf/d4s-production/project-setup/outputs-production.tf
View File

@ -1 +0,0 @@
../variables/outputs-production.tf

1
openstack-tf/d4s-production/project-setup/production.auto.tfvars
View File

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

1
openstack-tf/d4s-production/project-setup/variables.tf
View File

@ -1 +0,0 @@
../../modules/common_variables/variables.tf

9
openstack-tf/d4s-production/variables/production.auto.tfvars
View File

@ -10,17 +10,11 @@ dns_zone = {
ttl = 8600
}
dns_zone_id = "74135b34-1a9c-4c01-8cf0-22450a5660c4"
default_security_group_name = "default_for_all"
main_private_network = {
name = "d4s-production-cloud-main"
description = "D4Science Production private network (use this as the main network)"
}
main_private_network_id = "020df98d-ae72-452a-b376-3b6dc289acac"
main_private_subnet = {
name = "d4s-production-cloud-main-subnet"
description = "D4Science Production main private subnet"
@ -30,8 +24,6 @@ main_private_subnet = {
allocation_end = "10.1.47.254"
}
main_private_subnet_id = "5d7b83ad-e058-4a3a-bfd8-d20ba6d42e1a"
external_router = {
name = "d4s-production-cloud-external-router"
description = "D4Science Production main router"
@ -55,7 +47,6 @@ basic_services_ip = {
main_haproxy_l7_ip = ["10.1.40.11", "10.1.40.12"]
octavia_information = {
main_lb_name = "d4s-production-cloud-l4-load-balancer"
main_lb_description = "Main L4 load balancer for the D4Science production"