Skip to content

Commit

Permalink
fix the storage adapter ip info type (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
duzitong authored Sep 24, 2024
1 parent a946da6 commit 499d8ce
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 20 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -593,11 +593,11 @@ Description: The IP information for the storage networks. Key is the storage net
Type:

```hcl
map(object({
map(list(object({
physicalNode = string
ipv4Address = string
subnetMask = string
}))
})))
```

Default: `null`
Expand Down
24 changes: 8 additions & 16 deletions locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -75,26 +75,18 @@ locals {
adapterPropertyOverrides = var.storage_rdma_enabled ? (var.storage_connectivity_switchless ? local.switchless_adapter_properties : local.rdma_adapter_properties) : local.adapter_properties
}]
storage_adapters = flatten([for storageNetwork in var.storage_networks : storageNetwork.networkAdapterName])
storage_networks = var.storage_adapter_ip_info == null ? flatten(var.storage_networks) : (
length(local.vlan_ids) == 0 ? [
for idx, storageNetwork in var.storage_networks : {
name = storageNetwork.name
networkAdapterName = storageNetwork.networkAdapterName
storageAdapterIPInfo = flatten(var.storage_adapter_ip_info[storageNetwork.name])
}
] : [
for storageNetwork in var.storage_networks : {
name = storageNetwork.name
networkAdapterName = storageNetwork.networkAdapterName
vlanId = storageNetwork.vlanId
storageAdapterIPInfo = flatten(var.storage_adapter_ip_info[storageNetwork.name])
}
])
storage_networks = var.storage_adapter_ip_info == null ? flatten(var.storage_networks) : [
for storageNetwork in var.storage_networks : {
name = storageNetwork.name
networkAdapterName = storageNetwork.networkAdapterName
vlanId = storageNetwork.vlanId
storageAdapterIPInfo = var.storage_adapter_ip_info[storageNetwork.name]
}
]
switchless_adapter_properties = {
jumboPacket = "9014"
networkDirect = "Enabled"
networkDirectTechnology = "iWARP"
}
vlan_ids = flatten([for storageNetwork in var.storage_networks : storageNetwork.vlanId])
witness_storage_account_resource_group_name = var.witness_storage_account_resource_group_name == "" ? var.resource_group_name : var.witness_storage_account_resource_group_name
}
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -424,11 +424,11 @@ variable "secrets_location" {
}

variable "storage_adapter_ip_info" {
type = map(object({
type = map(list(object({
physicalNode = string
ipv4Address = string
subnetMask = string
}))
})))
default = null
description = "The IP information for the storage networks. Key is the storage network name."
}
Expand Down

0 comments on commit 499d8ce

Please sign in to comment.