From 0fdfcfdf0950a37dfb1d6dc05a4c90e4700baa5e Mon Sep 17 00:00:00 2001 From: ngruelaneo <100275739+ngruelaneo@users.noreply.github.com> Date: Thu, 21 Sep 2023 09:40:32 +0200 Subject: [PATCH] Revert "feat: variablise activemq class name and path on premise" --- .../quick-deploy/localhost/all-in-one/storage.tf | 10 ++++------ .../quick-deploy/localhost/all-in-one/variables.tf | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/infrastructure/quick-deploy/localhost/all-in-one/storage.tf b/infrastructure/quick-deploy/localhost/all-in-one/storage.tf index b473bf7e7..477c17c72 100644 --- a/infrastructure/quick-deploy/localhost/all-in-one/storage.tf +++ b/infrastructure/quick-deploy/localhost/all-in-one/storage.tf @@ -3,12 +3,10 @@ module "activemq" { source = "./generated/infra-modules/storage/onpremise/activemq" namespace = local.namespace activemq = { - image = var.activemq.image_name - tag = try(coalesce(var.activemq.image_tag), local.default_tags[var.activemq.image_name]) - node_selector = var.activemq.node_selector - image_pull_secrets = var.activemq.image_pull_secrets - adapter_class_name = var.activemq.adapter_class_name - adapter_absolute_path = var.activemq.adapter_absolute_path + image = var.activemq.image_name + tag = try(coalesce(var.activemq.image_tag), local.default_tags[var.activemq.image_name]) + node_selector = var.activemq.node_selector + image_pull_secrets = var.activemq.image_pull_secrets } } diff --git a/infrastructure/quick-deploy/localhost/all-in-one/variables.tf b/infrastructure/quick-deploy/localhost/all-in-one/variables.tf index 50a609b31..82295cfd4 100644 --- a/infrastructure/quick-deploy/localhost/all-in-one/variables.tf +++ b/infrastructure/quick-deploy/localhost/all-in-one/variables.tf @@ -90,12 +90,10 @@ variable "shared_storage" { variable "activemq" { description = "Parameters of ActiveMQ" type = object({ - image_name = optional(string, "symptoma/activemq") - image_tag = optional(string) - node_selector = optional(any, {}) - image_pull_secrets = optional(string, "") - adapter_class_name = optional(string, "ArmoniK.Core.Adapters.Amqp.QueueBuilder") - adapter_absolute_path = optional(string, "/adapters/queue/amqp/ArmoniK.Core.Adapters.Amqp.dll") + image_name = optional(string, "symptoma/activemq") + image_tag = optional(string) + node_selector = optional(any, {}) + image_pull_secrets = optional(string, "") }) default = {} }