Created the geoportal-service plan for Prepoduction infra

Commented version = "-> 1.53.0 or 1.54.0" in the modules 'instance_with{out}_data_volume"

openstack-tf/d4s-preprod/geoportal/main.tf

@@ -0,0 +1,76 @@
+# Define required providers
+terraform {
+  required_version = ">= 0.14.0"
+  required_providers {
+    openstack = {
+      source  = "terraform-provider-openstack/openstack"
+      version = "~> 1.54.0"
+    }
+  }
+}
+
+data "terraform_remote_state" "privnet_dns_router" {
+  backend = "local"
+
+  config = {
+    path = "../project-setup/terraform.tfstate"
+  }
+}
+
+#
+# Uses common_variables as module
+#
+module "common_variables" {
+  source = "../../modules/common_variables"
+}
+
+
+#
+# Creates the server group "geoportal"
+#
+resource "openstack_compute_servergroup_v2" "geoportal_server_group" {
+  name     = "geoportal"
+  policies = [module.common_variables.policy_list.soft_anti_affinity]
+}
+
+
+
+module "instance_without_data_volume" {
+  source = "../../modules/instance_without_data_volume"
+
+  instances_without_data_volume_map = {
+    geoportal = {
+      name              = "geoportal-cms",
+      description       = "This instance serves the Geoportal service of Preproduction",
+      flavor            = module.common_variables.flavor_list.m1_medium,
+      networks          = [data.terraform_remote_state.privnet_dns_router.outputs.main_private_network.name, module.common_variables.networks_list.shared_postgresql],
+      security_groups   = [data.terraform_remote_state.privnet_dns_router.outputs.default_security_group_name, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.http_and_https_from_the_load_balancers, data.terraform_remote_state.privnet_dns_router.outputs.security_group_list.debugging_from_jump_node],
+      server_groups_ids = [openstack_compute_servergroup_v2.geoportal_server_group.id],
+      image_ref         = module.common_variables.ubuntu_1804
+    }
+  }
+}
+
+
+locals {
+  cname_target = "main-lb.${data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name}"
+}
+
+#
+# Add DNS record/s
+#
+module "dns_records_create" {
+  source = "../../modules/dns_resources"
+
+  dns_resources_map = {
+    geoportal = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geoportal", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geoportal CNAME"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    }
+  }
+}
+

openstack-tf/d4s-preprod/geoportal/provider.tf

@@ -0,0 +1,3 @@
+provider "openstack" {
+  cloud = "d4s-pre"
+}

openstack-tf/modules/instance_with_data_volume/terraform-provider.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     openstack = {
       source  = "terraform-provider-openstack/openstack"
-      version = ">= 1.54.0"
+      # version = ">= 1.54.0"
     }
   }
 }

openstack-tf/modules/instance_without_data_volume/terraform-provider.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     openstack = {
       source  = "terraform-provider-openstack/openstack"
-      version = "~> 1.53.0"
+      # version = "~> 1.53.0"
     }
   }
 }

openstack-tf/modules/postgres/main.tf

@@ -64,7 +64,7 @@ resource "openstack_networking_secgroup_rule_v2" "postgresql_egress_rule_icmp" {
 
 ####################################################################################################################################################################
 # 
-#   Postgres instance configuration
+#   Postgres instance configurations
 #
 ####################################################################################################################################################################