From d67cc9343466906887d1080aa3864032a3910984 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Wed, 27 Nov 2024 09:47:21 +0000 Subject: [PATCH] Remove report_deployment_logs variable from deploy module Signed-off-by: Jim Enright --- modules/terraform-cdp-deploy/README.md | 1 - modules/terraform-cdp-deploy/main.tf | 3 --- modules/terraform-cdp-deploy/modules/aws/main.tf | 9 ++++----- modules/terraform-cdp-deploy/modules/aws/variables.tf | 7 ------- modules/terraform-cdp-deploy/modules/azure/main.tf | 7 +++---- modules/terraform-cdp-deploy/modules/azure/variables.tf | 7 ------- modules/terraform-cdp-deploy/modules/gcp/main.tf | 5 ++--- modules/terraform-cdp-deploy/modules/gcp/variables.tf | 7 ------- modules/terraform-cdp-deploy/variables.tf | 9 --------- 9 files changed, 9 insertions(+), 46 deletions(-) diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md index fdaf54d..d2a1575 100644 --- a/modules/terraform-cdp-deploy/README.md +++ b/modules/terraform-cdp-deploy/README.md @@ -135,7 +135,6 @@ No resources. | [multiaz](#input\_multiaz) | Flag to specify that the FreeIPA and DataLake instances will be deployed across multi-availability zones. | `bool` | `true` | no | | [proxy\_config\_name](#input\_proxy\_config\_name) | Name of the proxy config to use for the environment. | `string` | `null` | no | | [public\_key\_text](#input\_public\_key\_text) | SSH Public key string for the nodes of the CDP environment. Required for CDP deployment on Azure. For CDP deployment on AWS, either 'keypair\_name' or 'public\_key\_text' needs to be set. | `string` | `null` | no | -| [report\_deployment\_logs](#input\_report\_deployment\_logs) | Flag to enable reporting of additional diagnostic information back to Cloudera. | `bool` | `null` | no | | [s3\_guard\_table\_name](#input\_s3\_guard\_table\_name) | Name for the DynamoDB table backing S3Guard. Only applicable for CDP deployment on AWS. | `string` | `null` | no | | [use\_public\_ips](#input\_use\_public\_ips) | Use public ip's for the CDP resources created within the Cloud network. Required for CDP deployment on Azure and GCP. | `bool` | `null` | no | | [use\_single\_resource\_group](#input\_use\_single\_resource\_group) | Use a single resource group for all provisioned CDP resources. Required for CDP deployment on Azure. | `bool` | `true` | no | diff --git a/modules/terraform-cdp-deploy/main.tf b/modules/terraform-cdp-deploy/main.tf index 5ad92c8..0e83317 100644 --- a/modules/terraform-cdp-deploy/main.tf +++ b/modules/terraform-cdp-deploy/main.tf @@ -38,7 +38,6 @@ module "cdp_on_aws" { multiaz = var.multiaz freeipa_instances = var.freeipa_instances workload_analytics = var.workload_analytics - report_deployment_logs = var.report_deployment_logs endpoint_access_scheme = local.endpoint_access_scheme environment_async_creation = var.environment_async_creation @@ -112,7 +111,6 @@ module "cdp_on_azure" { multiaz = var.multiaz freeipa_instances = var.freeipa_instances workload_analytics = var.workload_analytics - report_deployment_logs = var.report_deployment_logs endpoint_access_scheme = local.endpoint_access_scheme environment_async_creation = var.environment_async_creation @@ -205,7 +203,6 @@ module "cdp_on_gcp" { freeipa_recipes = var.freeipa_recipes workload_analytics = var.workload_analytics - report_deployment_logs = var.report_deployment_logs endpoint_access_scheme = local.endpoint_access_scheme availability_zones = var.gcp_availability_zones diff --git a/modules/terraform-cdp-deploy/modules/aws/main.tf b/modules/terraform-cdp-deploy/modules/aws/main.tf index 70540c1..16f0dc2 100644 --- a/modules/terraform-cdp-deploy/modules/aws/main.tf +++ b/modules/terraform-cdp-deploy/modules/aws/main.tf @@ -60,11 +60,10 @@ resource "cdp_environments_aws_environment" "cdp_env" { os = var.freeipa_os } - proxy_config_name = var.proxy_config_name - s3_guard_table_name = var.s3_guard_table_name - workload_analytics = var.workload_analytics - report_deployment_logs = var.report_deployment_logs - enable_tunnel = var.enable_ccm_tunnel + proxy_config_name = var.proxy_config_name + s3_guard_table_name = var.s3_guard_table_name + workload_analytics = var.workload_analytics + enable_tunnel = var.enable_ccm_tunnel encryption_key_arn = var.encryption_key_arn diff --git a/modules/terraform-cdp-deploy/modules/aws/variables.tf b/modules/terraform-cdp-deploy/modules/aws/variables.tf index f50413a..83fa048 100644 --- a/modules/terraform-cdp-deploy/modules/aws/variables.tf +++ b/modules/terraform-cdp-deploy/modules/aws/variables.tf @@ -64,13 +64,6 @@ variable "enable_ccm_tunnel" { } -variable "report_deployment_logs" { - type = bool - - description = "Flag to enable reporting of additional diagnostic information back to Cloudera" - -} - variable "enable_raz" { type = bool diff --git a/modules/terraform-cdp-deploy/modules/azure/main.tf b/modules/terraform-cdp-deploy/modules/azure/main.tf index 4f2566e..a817166 100644 --- a/modules/terraform-cdp-deploy/modules/azure/main.tf +++ b/modules/terraform-cdp-deploy/modules/azure/main.tf @@ -81,10 +81,9 @@ resource "cdp_environments_azure_environment" "cdp_env" { os = var.freeipa_os } - proxy_config_name = var.proxy_config_name - workload_analytics = var.workload_analytics - report_deployment_logs = var.report_deployment_logs - enable_tunnel = var.enable_ccm_tunnel + proxy_config_name = var.proxy_config_name + workload_analytics = var.workload_analytics + enable_tunnel = var.enable_ccm_tunnel enable_outbound_load_balancer = var.enable_outbound_load_balancer encryption_key_resource_group_name = var.encryption_key_resource_group_name diff --git a/modules/terraform-cdp-deploy/modules/azure/variables.tf b/modules/terraform-cdp-deploy/modules/azure/variables.tf index d910938..14b9dde 100644 --- a/modules/terraform-cdp-deploy/modules/azure/variables.tf +++ b/modules/terraform-cdp-deploy/modules/azure/variables.tf @@ -70,13 +70,6 @@ variable "enable_ccm_tunnel" { } -variable "report_deployment_logs" { - type = bool - - description = "Flag to enable reporting of additional diagnostic information back to Cloudera" - -} - variable "enable_raz" { type = bool diff --git a/modules/terraform-cdp-deploy/modules/gcp/main.tf b/modules/terraform-cdp-deploy/modules/gcp/main.tf index ed6fe64..38f7bc3 100644 --- a/modules/terraform-cdp-deploy/modules/gcp/main.tf +++ b/modules/terraform-cdp-deploy/modules/gcp/main.tf @@ -59,9 +59,8 @@ resource "cdp_environments_gcp_environment" "cdp_env" { recipes = var.freeipa_recipes } - workload_analytics = var.workload_analytics - report_deployment_logs = var.report_deployment_logs - enable_tunnel = var.enable_ccm_tunnel + workload_analytics = var.workload_analytics + enable_tunnel = var.enable_ccm_tunnel polling_options = { async = var.environment_async_creation diff --git a/modules/terraform-cdp-deploy/modules/gcp/variables.tf b/modules/terraform-cdp-deploy/modules/gcp/variables.tf index e1360f9..c81967b 100644 --- a/modules/terraform-cdp-deploy/modules/gcp/variables.tf +++ b/modules/terraform-cdp-deploy/modules/gcp/variables.tf @@ -64,13 +64,6 @@ variable "enable_ccm_tunnel" { } -variable "report_deployment_logs" { - type = bool - - description = "Flag to enable reporting of additional diagnostic information back to Cloudera" - -} - variable "enable_raz" { type = bool diff --git a/modules/terraform-cdp-deploy/variables.tf b/modules/terraform-cdp-deploy/variables.tf index 8e5e703..d1922ae 100644 --- a/modules/terraform-cdp-deploy/variables.tf +++ b/modules/terraform-cdp-deploy/variables.tf @@ -215,15 +215,6 @@ variable "workload_analytics" { default = true } -variable "report_deployment_logs" { - type = bool - - description = "Flag to enable reporting of additional diagnostic information back to Cloudera." - - default = null - -} - variable "datalake_scale" { type = string