Added geonetwork-next

openstack-tf/d4s-dev/geonetwork/.terraform.lock.hcl

@@ -2,23 +2,23 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/terraform-provider-openstack/openstack" {
-  version     = "1.53.0"
-  constraints = "~> 1.53.0"
+  version     = "2.0.0"
+  constraints = ">= 1.54.0"
   hashes = [
-    "h1:YLGvYkSuagyP5orUTyKNK+JhzS17EFTUDpZ5R5/fFv4=",
-    "zh:09da7ca98ffd3de7b9ce36c4c13446212a6e763ba1162be71b50f95d453cb68e",
-    "zh:14041bcbb87312411d88612056ed185650bfd01284b8ea0761ce8105a331708e",
-    "zh:35bf4c788fdbc17c8e40ebc7b33c7de4b45a2fa2efaa657b10f0e3bd37c9627f",
-    "zh:46ede8ef4cfa12d654c538afc1e1ec34a1f3e8eb4e986ee23dceae398b7176a6",
-    "zh:59675734990dab1e8d87997853ea75e8104bba730b3f5a7146ac735540c9d6bf",
-    "zh:6de52428849806498670e827b54810be7510a2a79449602c1aede4235a0ec036",
-    "zh:78b2a20601272afceffac8f8ca78a6b647b84196c0dd8dc710fae297f6be15a4",
-    "zh:7c41ed3a4fac09677e676ecf9f9edd1e38eef449e656cb01a848d2c799c6de8f",
-    "zh:852800228f4118a4aa6cfaa4468b851247cbed6f037fd204f08de69eb1edc149",
-    "zh:86d618e7f9a07d978b8bc4b190be350a00de64ec535f9c8f5dfe133542a55483",
-    "zh:963a9e72b66d8bcf43de9b14a674ae3ca3719ce2f829217f7a65b66fc3773397",
-    "zh:a8e72ab67795071bda61f99a6de3d2d40122fb51971768fd75e1324abe874ced",
-    "zh:ce1890cf3af17d569af3bc7673cec0a8f78e6f5d701767593f3d29c551f44848",
-    "zh:e6f1b96eb684f527a47f71923f268c86a36d7894751b31ee9e726d7502a639cd",
+    "h1:raN7bKNdWwlAUprknjprlcP8/YluslrdVtyO+YI4PHs=",
+    "zh:17dcb07e1af0bf5dfa0aa280a7ad450dffcd4c2b2fba91088eb5ec191ad8a0a0",
+    "zh:2546f047d34f4372e4eb10db5ba23a45a8952327ae94d15371b2432ba477404e",
+    "zh:257a96029772251de0ce039483d565744e28e902904a60cb2e1d0af91b09d74d",
+    "zh:29d71f2a9d74701965a19ad1623d46bfe624e7d58c261075acad04bef373b579",
+    "zh:30e759253fb7df4d24de8e248ff5f0f038c6e54b82377c70bc19815443476eb6",
+    "zh:383d8286588b0ccd02062373ee7812ad583775b7d1ef09112716ebf3a6f257cd",
+    "zh:533beb32a7d355f5ecfc249eb40a9800061dd2590960c48910d7ab8a711495ef",
+    "zh:5f52cfb93aabf766d6781f66b9cee8b9126a52a330e16c6eadd1b52e8c251870",
+    "zh:6720f59ade2db328d8e3d37ac4bd588a186379d6c29ebd76761fca916a230ddc",
+    "zh:725c285c6e979d9564ae0c6017587e65ca6727733cb6fdf0af57047e0f89cb00",
+    "zh:739ec820139bdd742743c892f0c123b3ef4c0288ed33739380ed362cdcb49085",
+    "zh:7d223f9e986a8ece51f86143d01f2c7d805c55dce1090e53059d8a38e1121de4",
+    "zh:9d682904a5346febb820f7d1290d3a5bd09761c0427c9854c3248d222ce970c2",
+    "zh:f06515d93af460abc39e7713089f9fe714bcb25315582628ecb0b1af7a2a6e2f",
   ]
 }

openstack-tf/d4s-dev/geonetwork/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     openstack = {
       source  = "terraform-provider-openstack/openstack"
-      version = "~> 1.53.0"
+      version = ">= 1.54.0"
     }
   }
 }
@@ -16,7 +16,6 @@ data "terraform_remote_state" "privnet_dns_router" {
     path = "../project-setup/terraform.tfstate"
   }
 }
-
 #
 # Uses common_variables as module
 #
@@ -24,33 +23,45 @@ module "common_variables" {
   source = "../../modules/common_variables"
 }
 
-
-#
-# Creates the server group "sdi-geo"
-#
-resource "openstack_compute_servergroup_v2" "sdi_geo_server_group" {
-  name     = "sdi-geo"
-  policies = [module.common_variables.policy_list.soft_anti_affinity]
-}
-
-
 module "instance_with_data_volume" {
   source = "../../modules/instance_with_data_volume"
 
   instances_with_data_volume_map = {
-    geonetwork_1 = {
-      name              = "geonetwork-1",
+    geonetwork_next = {
+      name              = "geonetwork-next",
       description       = "This instance serves geonetwork service",
       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],
-      server_groups_ids = [openstack_compute_servergroup_v2.sdi_geo_server_group.id],
+      server_groups_ids = [],
       image_ref         = module.common_variables.ubuntu_1804
-       volume = {
-        name     = "geonetwork_1_data_volume",
-        size     = "30",
-        device   = "/dev/vdb"
+      volume = {
+        name   = "geonetwork_next_data_volume",
+        size   = "20",
+        device = "/dev/vdb"
       }
     }
   }
 }
+
+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 = {
+    geonetwork-next = {
+      zone_id     = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
+      name        = join(".", ["geonetwork-next", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
+      description = "Geonetwork geonetwork-next"
+      ttl         = 8600
+      type        = "CNAME"
+      records     = [local.cname_target]
+    }
+  }
+}