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

Rework the common and production variables.

This commit is contained in:
Andrea Dell'Amico 2023-12-11 22:12:54 +01:00
parent 864322d3a1
commit 6809103372
Signed by: andrea.dellamico
GPG Key ID: 147ABE6CEB9E20FF
6 changed files with 42 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openstack-tf/d4s-production/variables/outputs-production.tf
View File

@ -6,10 +6,6 @@ output "dns_zone" {
value = var.dns_zone
}
output "dns_zone_id" {
value = var.dns_zone_id
}
output "default_security_group_name" {
value = "default_for_all"
}
@ -18,19 +14,10 @@ output "main_private_network" {
value = var.main_private_network
}
output "main_private_network_id" {
# Set with the correct value after the setup is complete
value = var.main_private_network_id
}
output "main_private_subnet" {
value = var.main_private_subnet
}
output "main_private_subnet_id" {
value = var.main_private_subnet_id
}
output "external_router" {
value = var.external_router
}

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

@ -55,3 +55,4 @@ octavia_information = {
octavia_flavor_id = "394988b5-6603-4a1e-a939-8e177c6681c7"
main_lb_hostname = "main-lb"
}

5
openstack-tf/d4s-production/variables/variables-production.tf
View File

@ -15,11 +15,6 @@ variable "dns_zone" {
}
}
variable "dns_zone_id" {
# Set with the correct value after the setup is complete
default = "74135b34-1a9c-4c01-8cf0-22450a5660c4"
}
variable "default_security_group_name" {
default = "default_for_all"
}

63
openstack-tf/modules/common_variables/outputs.tf
View File

@ -44,46 +44,6 @@ output "networks_with_d4s_services" {
value = var.networks_with_d4s_services
}
# output "dns_zone" {
# value = {
# zone_name = var.dns_zone.zone_name
# email = var.dns_zone.email
# description = var.dns_zone.description
# ttl = var.dns_zone.ttl
# id = var.dns_zone.id
# }
# }
output "dns_zone" {
value = var.dns_zone
}
output "dns_zone_id" {
value = var.dns_zone_id
}
output "main_private_network" {
value = {
name = var.main_private_network.name
description = var.main_private_network.description
}
}
output "main_private_network_id" {
value = var.main_private_network_id
}
output "main_private_subnet" {
value = var.main_private_subnet
}
output "main_private_subnet_id" {
value = var.main_private_subnet_id
}
output "external_router" {
value = var.external_router
}
output "ubuntu_1804" {
value = var.ubuntu_1804
}
@ -140,26 +100,6 @@ output "smartexecutor_addresses" {
value = var.smartexecutor_addresses
}
output "os_project_data" {
value = var.os_project_data
}
output "default_security_group_name" {
value = var.default_security_group_name
}
output "basic_services_ip" {
value = var.basic_services_ip
}
output "main_haproxy_l7_ip" {
value = var.main_haproxy_l7_ip
}
output "octavia_information" {
value = var.octavia_information
}
#Added by Francesco
output "policy_list" {
value = var.policy_list
@ -180,4 +120,7 @@ output "networks_list" {
value = var.networks_list
}
# output "default_security_group_name" {
# value = var.default_security_group_name
# }

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

@ -37,85 +37,6 @@ variable "availability_zones_names" {
}
}
variable "ssh_sources" {
type = map(string)
default = {
s2i2s_vpn_1_cidr = "146.48.28.10/32"
s2i2s_vpn_2_cidr = "146.48.28.11/32"
d4s_vpn_1_cidr = "146.48.122.27/32"
d4s_vpn_2_cidr = "146.48.122.49/32"
shell_d4s_cidr = "146.48.122.95/32"
infrascience_net_cidr = "146.48.122.0/23"
}
}
variable "networks_with_d4s_services" {
type = map(string)
default = {
"isti_net" = "146.48.80.0/21"
"s2i2s_net" = "146.48.28.0/22"
"infrascience_net" = "146.48.122.0/23"
"garr_ct1_net" = "90.147.166.0/23"
"garr_pa1_net" = "90.147.188.0/23"
"garr_na_net" = "90.147.152.0/24"
}
}
variable "dns_zone" {
type = map(string)
default = {
zone_name = ""
email = "postmaster@isti.cnr.it"
description = ""
ttl = 8600
id = ""
}
}
variable "dns_zone_id" {
# Set with the correct value after the setup is complete
default = ""
}
variable "main_private_network" {
type = map(string)
default = {
name = ""
description = ""
}
}
variable "main_private_network_id" {
# Set with the correct value after the setup is complete
default = ""
}
variable "main_private_subnet" {
type = map(string)
default = {
name = ""
description = ""
cidr = ""
gateway_ip = ""
allocation_start = ""
allocation_end = ""
}
}
variable "main_private_subnet_id" {
# Set with the correct value after the setup is complete
default = ""
}
variable "external_router" {
type = map(string)
default = {
name = ""
description = ""
id = ""
}
}
variable "ubuntu_1804" {
type = map(string)
@ -235,58 +156,6 @@ variable "smartexecutor_addresses" {
}
}
variable "os_project_data" {
type = map(string)
default = {
id = ""
}
}
variable "default_security_group_name" {
default = "default_for_all"
}
variable "basic_services_ip" {
type = map(string)
default = {
ca = ""
ca_cidr = ""
ssh_jump = ""
ssh_jump_cidr = ""
prometheus = ""
prometheus_cidr = ""
haproxy_l7_1 = ""
haproxy_l7_1_cidr = ""
haproxy_l7_2 = ""
haproxy_l7_2_cidr = ""
octavia_main = ""
octavia_main_cidr = ""
}
}
variable "main_haproxy_l7_ip" {
type = list(string)
default = []
}
variable "octavia_information" {
type = map(string)
default = {
main_lb_name = ""
main_lb_description = ""
swarm_lb_name = ""
octavia_flavor = ""
octavia_flavor_id = ""
main_lb_hostname = ""
# 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 = ""
octavia_vrrp_ip_2 = ""
}
}
# Added by Francesco
# Create in the path 'modules/ssh-key-ref' the file 'ssh-key-ref-outputs.tf'
# with the following outputs:
@ -310,10 +179,6 @@ variable "octavia_information" {
# resource "openstack_compute_instance_v2" "geoserver" {
# key_pair = module.ssh_settings.ssh_key_name
module "ssh_settings" {
source = "../../modules/ssh-key-ref"
}
# Added by Francesco
variable "flavor_list" {
type = map(string)
@ -344,6 +209,7 @@ variable "security_group_list" {
haproxy = "HAPROXY L7"
orientdb_internal_docker_traffic = "orientdb_internal_docker_traffic"
limited_SSH_access = "Limited SSH access"
debugging_from_jump_node = "debugging_from_jump_node"
access_to_the_timescaledb_service = "access_to_the_timescaledb_service"
docker_swarm = "Docker Swarm"
http_and_https_from_the_load_balancers = "http and https from the load balancers"
@ -376,5 +242,33 @@ variable "networks_list" {
orientdb = "orientdb-net"
orientdb_se = "orientdb-se-net"
}
}
variable "ssh_sources" {
type = map(string)
default = {
s2i2s_vpn_1_cidr = "146.48.28.10/32"
s2i2s_vpn_2_cidr = "146.48.28.11/32"
d4s_vpn_1_cidr = "146.48.122.27/32"
d4s_vpn_2_cidr = "146.48.122.49/32"
shell_d4s_cidr = "146.48.122.95/32"
infrascience_net_cidr = "146.48.122.0/23"
}
}
variable "networks_with_d4s_services" {
type = map(string)
default = {
"isti_net" = "146.48.80.0/21"
"s2i2s_net" = "146.48.28.0/22"
"infrascience_net" = "146.48.122.0/23"
"garr_ct1_net" = "90.147.166.0/23"
"garr_pa1_net" = "90.147.188.0/23"
"garr_na_net" = "90.147.152.0/24"
}
}
# variable "default_security_group_name" {
# default = "default_for_all"
# }

20
openstack-tf/modules/main_private_net_and_dns_zone/outputs.tf
View File

@ -1,19 +1,15 @@
output "os_project_data" {
value = var.os_project_data
output "dns_zone_id" {
value = openstack_dns_zone_v2.primary_project_dns_zone.id
}
output "dns_zone" {
value = var.dns_zone
output "main_private_network_id" {
value = openstack_networking_network_v2.main-private-network.id
}
output "main_private_network" {
value = var.main_private_network
output "main_subnet_network_id" {
value = openstack_networking_subnet_v2.main-private-subnet.id
}
output "main_private_subnet" {
value = var.main_private_subnet
}
output "external_router" {
value = var.external_router
output "external_gateway_ip" {
value = openstack_networking_router_v2.external-router.external_fixed_ip
}