Merge pull request #69 from remerge/remove-cluster-zone

Remove cluster and zone from Redis and PostgreSQL

Author: hollow

google/redis/main.tf

@@ -37,13 +37,12 @@ module "netbox-vm" {
 
   project = var.project
 
-  name = coalesce(var.hostname, var.name)
-  zone = var.zone
+  name = var.name
+  tags = [var.workspace]
 
   role     = "Redis"
   platform = "Google Cloud"
-  site     = var.site
-  cluster  = var.cluster
+  site     = "Google Cloud ${google_redis_instance.main.region}"
 
   interface  = "internal"
   ip_address = google_redis_instance.main.host

google/redis/variables.tf

@@ -1,3 +1,7 @@
+variable "workspace" {
+  type = string
+}
+
 variable "project" {
   type = string
 }
@@ -8,27 +12,8 @@ variable "region" {
 }
 
 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
+  default = "redis"
 }
 
 variable "network" {

google/sql/postgresql/main.tf

@@ -85,13 +85,12 @@ module "netbox-vm" {
 
   project = var.project
 
-  name = coalesce(var.hostname, var.name)
-  zone = var.zone
+  name = var.name
+  tags = [var.workspace]
 
   role     = "PostgreSQL"
   platform = "Google Cloud"
-  site     = coalesce(var.site, "Google Cloud ${google_sql_database_instance.main.region}")
-  cluster  = var.cluster
+  site     = "Google Cloud ${google_sql_database_instance.main.region}"
 
   interface  = "internal"
   ip_address = google_sql_database_instance.main.private_ip_address

google/sql/postgresql/variables.tf

@@ -1,3 +1,7 @@
+variable "workspace" {
+  type = string
+}
+
 variable "project" {
   type = string
 }
@@ -12,26 +16,6 @@ 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"

netbox/vm/main.tf

@@ -1,13 +1,12 @@
 locals {
-  domain     = try(trimsuffix(var.zone.dns_name, "."), "local")
-  fqdn       = "${var.name}.${local.domain}"
+  fqdn       = var.zone != null ? "${var.name}.${trimsuffix(var.zone.dns_name, ".")}" : null
   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, [])
 }
 
 resource "netbox_virtual_machine" "main" {
-  name        = local.fqdn
+  name        = var.zone != null ? local.fqdn : var.name
   role_id     = data.netbox_device_role.main.id
   platform_id = data.netbox_platform.main.id
   site_id     = var.site != null ? data.netbox_site.main[0].id : null