Add more options to override the default values (#16)

* change resource namespace to lower case * add more options to override the default value * fmt and doc
Azure · Sep 27, 2024 · 429e94e · 429e94e
1 parent 1e54abb
commit 429e94e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -540,6 +540,14 @@ Type: `string`
 
 Default: `"TLS1_2"`
 
+### <a name="input_naming_prefix"></a> [naming\_prefix](#input\_naming\_prefix)
+
+Description: The naming prefix in HCI deployment settings. Site id will be used if not provided.
+
+Type: `string`
+
+Default: `""`
+
 ### <a name="input_operation_type"></a> [operation\_type](#input\_operation\_type)
 
 Description: The intended operation for a cluster.

diff --git a/deploy.tf b/deploy.tf
@@ -1,7 +1,7 @@
 resource "azapi_update_resource" "deploymentsetting" {
   count = var.is_exported ? 0 : 1
 
-  type = "Microsoft.AzureStackHCI/clusters/deploymentSettings@2024-04-01"
+  type = "microsoft.azurestackhci/clusters/deploymentSettings@2024-04-01"
   body = {
     properties = {
       deploymentMode = "Deploy"

diff --git a/locals.tf b/locals.tf
@@ -49,7 +49,7 @@ locals {
     storage = {
       configurationMode = var.configuration_mode
     }
-    namingPrefix = var.site_id
+    namingPrefix = var.naming_prefix == "" ? var.site_id : var.naming_prefix
     domainFqdn   = var.domain_fqdn
     infrastructureNetwork = [{
       useDhcp    = false
@@ -68,10 +68,10 @@ locals {
       enableStorageAutoIp           = true
       intents                       = local.converged ? local.converged_intents : local.seperate_intents
       storageNetworks               = local.storage_networks
-      storageConnectivitySwitchless = false
+      storageConnectivitySwitchless = var.storage_connectivity_switchless
     }
     adouPath        = var.adou_path
-    secretsLocation = var.use_legacy_key_vault_model ? local.secrets_location : null
+    secretsLocation = var.use_legacy_key_vault_model ? local.secrets_location : (var.secrets_location == "" ? null : var.secrets_location)
     secrets = var.use_legacy_key_vault_model ? null : [
       {
         secretName     = "${var.name}-AzureStackLCMUserCredential"

diff --git a/main.tf b/main.tf
@@ -20,22 +20,22 @@ data "azapi_resource" "customlocation" {
 
 data "azapi_resource_list" "user_storages" {
   parent_id              = data.azurerm_resource_group.rg.id
-  type                   = "Microsoft.AzureStackHCI/storagecontainers@2022-12-15-preview"
+  type                   = "microsoft.azurestackhci/storagecontainers@2022-12-15-preview"
   response_export_values = ["*"]
 
   depends_on = [azapi_update_resource.deploymentsetting]
 }
 
 data "azapi_resource" "arc_settings" {
-  type      = "Microsoft.AzureStackHCI/clusters/ArcSettings@2024-04-01"
+  type      = "microsoft.azurestackhci/clusters/ArcSettings@2024-04-01"
   name      = "default"
   parent_id = azapi_resource.cluster.id
 
   depends_on = [azapi_update_resource.deploymentsetting]
 }
 
 resource "azapi_resource" "cluster" {
-  type = "Microsoft.AzureStackHCI/clusters@2024-04-01"
+  type = "microsoft.azurestackhci/clusters@2024-04-01"
   body = {
     properties = {}
   }

diff --git a/validate.tf b/validate.tf
@@ -9,7 +9,7 @@ data "azurerm_arc_machine" "arcservers" {
 }
 
 resource "azapi_resource" "validatedeploymentsetting" {
-  type = "Microsoft.AzureStackHCI/clusters/deploymentSettings@2024-04-01"
+  type = "microsoft.azurestackhci/clusters/deploymentSettings@2024-04-01"
   body = {
     properties = local.deployment_setting_properties_omit_null
   }

diff --git a/variables.tf b/variables.tf
@@ -388,6 +388,12 @@ variable "min_tls_version" {
   description = "The minimum TLS version."
 }
 
+variable "naming_prefix" {
+  type        = string
+  default     = ""
+  description = "The naming prefix in HCI deployment settings. Site id will be used if not provided."
+}
+
 variable "operation_type" {
   type        = string
   default     = "ClusterProvisioning"