Merge branch 'main' into DSP-774

Author: hollow

google/sql/postgresql/main.tf

@@ -90,7 +90,7 @@ module "netbox-vm" {
 
   role     = "PostgreSQL"
   platform = "Google Cloud"
-  site     = var.site
+  site     = coalesce(var.site, "Google Cloud ${google_sql_database_instance.main.region}")
   cluster  = var.cluster
 
   interface  = "internal"

google/sql/postgresql/variables.tf

@@ -8,7 +8,8 @@ variable "region" {
 }
 
 variable "name" {
-  type = string
+  type    = string
+  default = "postgres"
 }
 
 variable "hostname" {
@@ -33,7 +34,7 @@ variable "cluster" {
 
 variable "database_version" {
   type    = string
-  default = "POSTGRES_16"
+  default = "POSTGRES_17"
 }
 
 variable "tier" {

netbox/vm/main.tf

@@ -1,7 +1,6 @@
 locals {
-  hostname   = coalesce(var.hostname, var.name)
   domain     = try(trimsuffix(var.zone.dns_name, "."), "local")
-  fqdn       = "${local.hostname}.${local.domain}"
+  fqdn       = "${var.name}.${local.domain}"
   ip_address = var.ip_address != null ? split("/", var.ip_address)[0] : null
   ip_prefix  = var.ip_address != null ? try(split("/", var.ip_address)[1], "32") : null
   tags       = var.tags != null ? var.tags : try(data.netbox_cluster.main[0].tags, [])

netbox/vm/variables.tf

@@ -6,11 +6,6 @@ variable "name" {
   type = string
 }
 
-variable "hostname" {
-  type    = string
-  default = null
-}
-
 variable "zone" {
   type    = any
   default = null