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

Added list of security groups and updated the geoserver.tf

This commit is contained in:
Francesco Mangiacrapa 2023-11-24 09:51:04 +01:00
parent 031c011bf6
commit a96af024a0
2 changed files with 72 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openstack-tf/d4s-dev/variables/variables-dev.tf
View File

@ -117,3 +117,29 @@ variable "orientdb_se_secgroup" {
variable "postgresql_secgroup" { variable "postgresql_secgroup" {
default = "PostgreSQL service" default = "PostgreSQL service"
} }
#Added by Francesco
variable "security_group_list" {
type = map(string)
default = {
postgreSQL = "PostgreSQL service"
acaland = "acaland's dev machine"
haproxy = "HAPROXY L7"
access_to_orientdb = "access_to_orientdb"
dataminer-publish = "dataminer-publish"
docker_swarm_NFS = "Docker Swarm NFS"
public_HTTPS = "Public HTTPS"
haproxy = "HAPROXY L7"
orientdb_internal_docker_traffic = "orientdb_internal_docker_traffic"
limited_SSH_access = "Limited SSH access"
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"
limited_HTTPS_access = "Limited HTTPS access"
mongo = "mongo"
limited_SSH_access = "Limited SSH access"
default = "default"
cassandra = "Cassandra"
access_to_orientdb_se = "access_to_orientdb_se"
}
}

4
openstack-tf/modules/geoserver/geoserver.tf
View File

@ -1,4 +1,4 @@
#Geoserver attached volume - used for 'geoserver_data' # Geoserver attached volume - used for 'geoserver_data'
resource "openstack_blockstorage_volume_v3" "geoserver_data_vol" { resource "openstack_blockstorage_volume_v3" "geoserver_data_vol" {
name = var.geoserver_basic_data.vol_data_name name = var.geoserver_basic_data.vol_data_name
size = var.geoserver_basic_data.vol_data_size size = var.geoserver_basic_data.vol_data_size
@ -10,7 +10,7 @@ resource "openstack_compute_instance_v2" "geoserver" {
availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu availability_zone_hints = var.availability_zones_names.availability_zone_no_gpu
flavor_name = var.geoserver_basic.flavor flavor_name = var.geoserver_basic.flavor
key_pair = var.ssh_key_file.name key_pair = var.ssh_key_file.name
security_groups = [var.default_security_group_name] security_groups = [var.security_group_list.default, var.security_group_list.http_and_https_from_the_load_balancers]
block_device { block_device {
uuid = var.ubuntu_1804.uuid uuid = var.ubuntu_1804.uuid
source_type = "image" source_type = "image"