Added geonetwork1

This commit is contained in:
Giancarlo Panichi 2024-10-31 12:13:28 +01:00
parent 7455dc273c
commit 6afc75b2c0
2 changed files with 41 additions and 36 deletions

View File

@ -4,7 +4,7 @@ terraform {
required_providers {
openstack = {
source = "terraform-provider-openstack/openstack"
version = "~> 1.53.0"
version = ">= 1.54.0"
}
}
}
@ -27,8 +27,8 @@ module "instance_with_data_volume" {
source = "../../modules/instance_with_data_volume"
instances_with_data_volume_map = {
geonetwork1_pre = {
name = "geonetwork1-pre",
geonetwork1 = {
name = "geonetwork1",
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],
@ -36,7 +36,7 @@ module "instance_with_data_volume" {
server_groups_ids = [],
image_ref = module.common_variables.ubuntu_1804
volume = {
name = "geonetwork1_pre_data_volume",
name = "geonetwork1_data_volume",
size = "20",
device = "/dev/vdb"
}
@ -55,10 +55,10 @@ module "dns_records_create" {
source = "../../modules/dns_resources"
dns_resources_map = {
geonetwork1-pre = {
geonetwork1 = {
zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
name = join(".", ["geonetwork1-pre", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
description = "Geonetwork geonetwork1-pre"
name = join(".", ["geonetwork1", data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
description = "Geonetwork geonetwork1"
ttl = 8600
type = "CNAME"
records = [local.cname_target]

View File

@ -1,7 +1,7 @@
{
"version": 4,
"terraform_version": "1.6.4",
"serial": 19,
"serial": 28,
"lineage": "80fc3754-c1fc-b63b-a078-170496b36b2a",
"outputs": {},
"resources": [
@ -132,6 +132,7 @@
"main_subnet_network_id": "cd77a2fd-4a36-4254-b1d0-70b3874c6d04",
"mtu_size": 8942,
"networks_list": {
"cassandra": "cassandra-net",
"orientdb": "orientdb-net",
"orientdb_se": "orientdb-se-net",
"shared_postgresql": "postgresql-srv-net",
@ -146,6 +147,7 @@
"isti_net": "146.48.80.0/21",
"s2i2s_net": "146.48.28.0/22"
},
"nfs_share_no_ingress_secgroup_id": "ddb16502-7217-4677-a8a7-ca0cbf9a779a",
"octavia_information": {
"main_lb_description": "Main L4 load balancer for the D4Science PRE production",
"main_lb_hostname": "main-lb",
@ -168,7 +170,7 @@
"prometheus_server_data": {
"flavor": "m1.medium",
"name": "prometheus",
"public_grafana_server_cidr": "146.48.122.132/32",
"public_grafana_server_cidr": "146.48.28.103/32",
"vol_data_device": "/dev/vdb",
"vol_data_name": "prometheus-data",
"vol_data_size": "100"
@ -195,6 +197,7 @@
"limited_HTTPS_access": "restricted_web_service",
"limited_SSH_access": "Limited SSH access",
"mongo": "mongo",
"nfs_share_no_ingress": "nfs_share_no_ingress",
"orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic",
"postgreSQL": "PostgreSQL service",
"public_HTTPS": "Public HTTPS"
@ -226,6 +229,8 @@
"s2i2s_vpn_2_cidr": "146.48.28.11/32",
"shell_d4s_cidr": "146.48.122.95/32"
},
"storage_nfs_network_id": "5f4023cc-4016-404c-94e5-86220095fbaf",
"storage_nfs_subnet_id": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696",
"ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh",
"ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh",
"ubuntu_1804": {
@ -326,6 +331,7 @@
"map",
"string"
],
"nfs_share_no_ingress_secgroup_id": "string",
"octavia_information": [
"map",
"string"
@ -370,6 +376,8 @@
"map",
"string"
],
"storage_nfs_network_id": "string",
"storage_nfs_subnet_id": "string",
"ubuntu1804_data_file": "string",
"ubuntu2204_data_file": "string",
"ubuntu_1804": [
@ -397,13 +405,13 @@
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
"instances": [
{
"index_key": "geonetwork1-pre",
"index_key": "geonetwork1",
"schema_version": 0,
"attributes": {
"description": "Geonetwork geonetwork1-pre",
"description": "Geonetwork geonetwork1",
"disable_status_check": false,
"id": "c1a4b4bc-f167-4387-855d-38f0f99ca05c/0bad49a2-0244-4714-8e03-e0923b135cec",
"name": "geonetwork1-pre.cloud-pre.d4science.org.",
"id": "c1a4b4bc-f167-4387-855d-38f0f99ca05c/c8a501e8-06ff-4009-bd9e-bbe7999564c1",
"name": "geonetwork1.cloud-pre.d4science.org.",
"project_id": "6fdc02e2827b405dad99f34698659742",
"records": [
"main-lb.cloud-pre.d4science.org."
@ -431,19 +439,19 @@
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
"instances": [
{
"index_key": "geonetwork1_pre",
"index_key": "geonetwork1",
"schema_version": 0,
"attributes": {
"attachment": [],
"availability_zone": "nova",
"backup_id": "",
"consistency_group_id": null,
"description": "",
"enable_online_resize": null,
"id": "ab367e14-03ae-4cc6-980f-a7a72e418e35",
"id": "1b2d6109-72ed-45ba-a064-d695c1a6d62e",
"image_id": null,
"metadata": {},
"multiattach": null,
"name": "geonetwork1_pre_data_volume",
"name": "geonetwork1_data_volume",
"region": "isti_area_pi_1",
"scheduler_hints": [],
"size": 20,
@ -469,10 +477,10 @@
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
"instances": [
{
"index_key": "geonetwork1_pre",
"index_key": "geonetwork1",
"schema_version": 0,
"attributes": {
"access_ip_v4": "10.1.35.94",
"access_ip_v4": "10.1.33.56",
"access_ip_v6": "",
"admin_pass": null,
"all_metadata": {},
@ -495,34 +503,31 @@
}
],
"config_drive": null,
"created": "2024-01-24 16:48:03 +0000 UTC",
"created": "2024-10-31 11:12:05 +0000 UTC",
"flavor_id": "4",
"flavor_name": "m1.medium",
"floating_ip": null,
"force_delete": false,
"id": "2b91c809-baea-4cd9-b623-920d7ad1f345",
"id": "1fa0d42a-3b5f-4f96-9089-9b9e11822db3",
"image_id": "Attempt to boot from volume - no image supplied",
"image_name": null,
"key_pair": "Giancarlo Panichi",
"metadata": null,
"name": "geonetwork1-pre",
"name": "geonetwork1",
"network": [
{
"access_network": false,
"fixed_ip_v4": "10.1.35.94",
"fixed_ip_v4": "10.1.33.56",
"fixed_ip_v6": "",
"floating_ip": "",
"mac": "fa:16:3e:6a:e8:bc",
"mac": "fa:16:3e:9f:14:47",
"name": "d4s-pre-cloud-main",
"port": "",
"uuid": "23fd8a99-d551-4ada-8d3a-9859542ebb8c"
},
{
"access_network": false,
"fixed_ip_v4": "192.168.3.132",
"fixed_ip_v4": "192.168.1.15",
"fixed_ip_v6": "",
"floating_ip": "",
"mac": "fa:16:3e:33:0c:1a",
"mac": "fa:16:3e:22:d8:25",
"name": "postgresql-srv-net",
"port": "",
"uuid": "e25395f4-f1aa-4819-b5a5-36d25ee5af54"
@ -540,10 +545,9 @@
"stop_before_destroy": false,
"tags": null,
"timeouts": null,
"updated": "2024-01-24 16:48:43 +0000 UTC",
"updated": "2024-10-31 11:12:56 +0000 UTC",
"user_data": "47d4769e61324c305c4b70ed6673de4fad84150d",
"vendor_options": [],
"volume": []
"vendor_options": []
},
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxODAwMDAwMDAwMDAwLCJkZWxldGUiOjE4MDAwMDAwMDAwMDAsInVwZGF0ZSI6MTgwMDAwMDAwMDAwMH19",
@ -561,17 +565,18 @@
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
"instances": [
{
"index_key": "geonetwork1_pre",
"index_key": "geonetwork1",
"schema_version": 0,
"attributes": {
"device": "/dev/vdb",
"id": "2b91c809-baea-4cd9-b623-920d7ad1f345/ab367e14-03ae-4cc6-980f-a7a72e418e35",
"instance_id": "2b91c809-baea-4cd9-b623-920d7ad1f345",
"id": "1fa0d42a-3b5f-4f96-9089-9b9e11822db3/1b2d6109-72ed-45ba-a064-d695c1a6d62e",
"instance_id": "1fa0d42a-3b5f-4f96-9089-9b9e11822db3",
"multiattach": null,
"region": "isti_area_pi_1",
"tag": null,
"timeouts": null,
"vendor_options": [],
"volume_id": "ab367e14-03ae-4cc6-980f-a7a72e418e35"
"volume_id": "1b2d6109-72ed-45ba-a064-d695c1a6d62e"
},
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwfX0=",