Remove cluster and zone from Redis and PostgreSQL

remerge · Feb 15, 2025 · 6babf93 · 6babf93
1 parent ca4d5c6
commit 6babf93
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 37 deletions.
diff --git a/google/redis/main.tf b/google/redis/main.tf
@@ -37,13 +37,11 @@ module "netbox-vm" {
 
   project = var.project
 
-  name = coalesce(var.hostname, var.name)
-  zone = var.zone
+  name = var.name
 
   role     = "Redis"
   platform = "Google Cloud"
-  site     = var.site
-  cluster  = var.cluster
+  site     = coalesce(var.site, "Google Cloud ${google_redis_instance.main.region}")
 
   interface  = "internal"
   ip_address = google_redis_instance.main.host

diff --git a/google/redis/variables.tf b/google/redis/variables.tf
@@ -11,26 +11,11 @@ variable "name" {
   type = string
 }
 
-variable "hostname" {
-  type    = string
-  default = null
-}
-
-variable "zone" {
-  type    = any
-  default = null
-}
-
 variable "site" {
   type    = any
   default = null
 }
 
-variable "cluster" {
-  type    = any
-  default = null
-}
-
 variable "network" {
   type = string
 }

diff --git a/google/sql/postgresql/main.tf b/google/sql/postgresql/main.tf
@@ -85,13 +85,11 @@ module "netbox-vm" {
 
   project = var.project
 
-  name = coalesce(var.hostname, var.name)
-  zone = var.zone
+  name = var.name
 
   role     = "PostgreSQL"
   platform = "Google Cloud"
   site     = coalesce(var.site, "Google Cloud ${google_sql_database_instance.main.region}")
-  cluster  = var.cluster
 
   interface  = "internal"
   ip_address = google_sql_database_instance.main.private_ip_address

diff --git a/google/sql/postgresql/variables.tf b/google/sql/postgresql/variables.tf
@@ -12,26 +12,11 @@ variable "name" {
   default = "postgres"
 }
 
-variable "hostname" {
-  type    = string
-  default = null
-}
-
-variable "zone" {
-  type    = any
-  default = null
-}
-
 variable "site" {
   type    = any
   default = null
 }
 
-variable "cluster" {
-  type    = any
-  default = null
-}
-
 variable "database_version" {
   type    = string
   default = "POSTGRES_17"