From 0e8f6d3653b8c343e781909ffd1d4c467e17b992 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Sat, 20 Apr 2024 15:45:21 +0200 Subject: [PATCH] Add more data to the garr-ct1 setup. --- .../garr-ct1/project-setup/outputs-ct1.tf | 10 ++++++++- .../garr-ct1/project-setup/terraform.tfstate | 22 ++++++++++++++++++- .../garr-ct1/project-setup/variables-ct1.tf | 18 ++++++++++++++- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/openstack-tf/garr-ct1/project-setup/outputs-ct1.tf b/openstack-tf/garr-ct1/project-setup/outputs-ct1.tf index 2a69f12..5f6c6f2 100644 --- a/openstack-tf/garr-ct1/project-setup/outputs-ct1.tf +++ b/openstack-tf/garr-ct1/project-setup/outputs-ct1.tf @@ -32,4 +32,12 @@ output "external_router" { output "external_network" { value = var.external_network -} \ No newline at end of file +} + +output "jump_proxy_ssh_shell" { + value = var.jump_proxy_ssh_shell +} + +output "prometheus_host" { + value = var.prometheus_host +} diff --git a/openstack-tf/garr-ct1/project-setup/terraform.tfstate b/openstack-tf/garr-ct1/project-setup/terraform.tfstate index ac5d3d3..d769c53 100644 --- a/openstack-tf/garr-ct1/project-setup/terraform.tfstate +++ b/openstack-tf/garr-ct1/project-setup/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.7.5", - "serial": 9, + "serial": 10, "lineage": "fbd4cad6-e66b-bb4c-d3e4-6440732201b7", "outputs": { "default_security_group_name": { @@ -28,6 +28,16 @@ "string" ] }, + "jump_proxy_ssh_shell": { + "value": { + "hostname": "shell.garr-ct1.d4science.net", + "private_ip": "192.168.100.4" + }, + "type": [ + "map", + "string" + ] + }, "main_private_network": { "value": { "description": "GARR CT1 main network", @@ -74,6 +84,16 @@ "string" ] }, + "prometheus_host": { + "value": { + "hostname": "ip-90-147-166-113.ct1.garrservices.it", + "private_ip": "192.168.100.15" + }, + "type": [ + "map", + "string" + ] + }, "resolvers_ip": { "value": [ "193.206.141.38", diff --git a/openstack-tf/garr-ct1/project-setup/variables-ct1.tf b/openstack-tf/garr-ct1/project-setup/variables-ct1.tf index c942902..5cb489e 100644 --- a/openstack-tf/garr-ct1/project-setup/variables-ct1.tf +++ b/openstack-tf/garr-ct1/project-setup/variables-ct1.tf @@ -60,4 +60,20 @@ variable "external_network" { name = "floating-ip" id = "bf588091-e239-4fc8-8d35-eee2bd7d3cb0" } -} \ No newline at end of file +} + +variable "jump_proxy_ssh_shell" { + type = map(string) + default = { + hostname = "shell.garr-ct1.d4science.net" + private_ip = "192.168.100.4" + } +} + +variable "prometheus_host" { + type = map(string) + default = { + hostname = "ip-90-147-166-113.ct1.garrservices.it" + private_ip = "192.168.100.15" + } +}