From 37462356bed4d7552a06aca32d2d35c8e94878a3 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Wed, 27 Sep 2023 20:17:01 +0100 Subject: [PATCH] Update README and fix fmt in cdp-deploy module Signed-off-by: Jim Enright --- modules/terraform-cdp-deploy/README.md | 6 ++++-- modules/terraform-cdp-deploy/modules/aws/main.tf | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/terraform-cdp-deploy/README.md b/modules/terraform-cdp-deploy/README.md index a0c7581..58facfb 100644 --- a/modules/terraform-cdp-deploy/README.md +++ b/modules/terraform-cdp-deploy/README.md @@ -18,7 +18,7 @@ In each directory an example `terraform.tfvars.sample` values file is included t | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.3.0 | -| [cdp](#requirement\_cdp) | 0.1.4-pre | +| [cdp](#requirement\_cdp) | 0.2.0 | ## Providers @@ -79,7 +79,8 @@ No resources. | [datalake\_image](#input\_datalake\_image) | The image to use for the datalake. Can only be used when the 'datalake\_version' parameter is set to null. You can use 'catalog' name and/or 'id' for selecting an image. | 
object({
    id      = optional(string)
    catalog = optional(string)
  })
| `null` | no | | [datalake\_java\_version](#input\_datalake\_java\_version) | The Java major version to use on the datalake cluster. | `number` | `null` | no | | [datalake\_name](#input\_datalake\_name) | Name of the CDP datalake. Defaults to '--dl' if not specified. | `string` | `null` | no | -| [datalake\_recipes](#input\_datalake\_recipes) | Additional recipes that will be attached on the datalake instances | 
list(
    object({
      instance_group_name = string,
      recipe_names        = string
    })
  )
| `null` | no | +| [datalake\_polling\_timeout](#input\_datalake\_polling\_timeout) | Timeout value in minutes for how long to poll for CDP datalake resource creation/deletion | `number` | `90` | no | +| [datalake\_recipes](#input\_datalake\_recipes) | Additional recipes that will be attached on the datalake instances | 
set(
    object({
      instance_group_name = string,
      recipe_names        = set(object({}))
    })
  )
| `null` | no | | [datalake\_scale](#input\_datalake\_scale) | The scale of the datalake. Valid values are LIGHT\_DUTY, ENTERPRISE. | `string` | `null` | no | | [datalake\_version](#input\_datalake\_version) | The Datalake Runtime version. Valid values are latest or a semantic version, e.g. 7.2.17 | `string` | `"latest"` | no | | [enable\_ccm\_tunnel](#input\_enable\_ccm\_tunnel) | Flag to enable Cluster Connectivity Manager tunnel. If false then access from Cloud to CDP Control Plane CIDRs is required from via SG ingress | `bool` | `true` | no | @@ -91,6 +92,7 @@ No resources. | [endpoint\_access\_scheme](#input\_endpoint\_access\_scheme) | The scheme for the workload endpoint gateway. PUBLIC creates an external endpoint that can be accessed over the Internet. PRIVATE which restricts the traffic to be internal to the VPC / Vnet. Relevant in Private Networks. | `string` | `null` | no | | [env\_prefix](#input\_env\_prefix) | Shorthand name for the environment. Used in CDP resource descriptions. This will be used to construct the value of where any of the CDP resource variables (e.g. environment\_name, cdp\_iam\_admin\_group\_name) are not defined. | `string` | `null` | no | | [environment\_name](#input\_environment\_name) | Name of the CDP environment. Defaults to '-cdp-env' if not specified. | `string` | `null` | no | +| [environment\_polling\_timeout](#input\_environment\_polling\_timeout) | Timeout value in minutes for how long to poll for CDP Environment resource creation/deletion | `number` | `60` | no | | [freeipa\_catalog](#input\_freeipa\_catalog) | Image catalog to use for FreeIPA image selection | `string` | `null` | no | | [freeipa\_image\_id](#input\_freeipa\_image\_id) | Image ID to use for creating FreeIPA instances | `string` | `null` | no | | [freeipa\_instance\_type](#input\_freeipa\_instance\_type) | Instance Type to use for creating FreeIPA instances | `string` | `null` | no | diff --git a/modules/terraform-cdp-deploy/modules/aws/main.tf b/modules/terraform-cdp-deploy/modules/aws/main.tf index 6f0267d..5cbdeab 100644 --- a/modules/terraform-cdp-deploy/modules/aws/main.tf +++ b/modules/terraform-cdp-deploy/modules/aws/main.tf @@ -124,8 +124,8 @@ resource "cdp_datalake_aws_datalake" "cdp_datalake" { datalake_name = var.datalake_name environment_name = cdp_environments_aws_environment.cdp_env.environment_name - instance_profile = var.idbroker_instance_profile_arn - storage_location_base = var.data_storage_location + instance_profile = var.idbroker_instance_profile_arn + storage_location_base = var.data_storage_location runtime = var.datalake_version == "latest" ? null : var.datalake_version scale = var.datalake_scale