Skip to content

Commit e9dcc85

Browse files
author
Marges, RSY (Rick)
committed
Add extra check for ANF on DB loadbalancer
1 parent 753df4b commit e9dcc85

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

deploy/terraform/terraform-units/modules/sap_system/hdb_node/infrastructure.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ resource "azurerm_lb_probe" "hdb" {
105105
resource "azurerm_network_interface_backend_address_pool_association" "hdb" {
106106
provider = azurerm.main
107107
count = local.enable_db_lb_deployment ? var.database_server_count : 0
108-
network_interface_id = var.database.scale_out && var.database_dual_nics ? azurerm_network_interface.nics_dbnodes_admin[count.index].id : azurerm_network_interface.nics_dbnodes_db[count.index].id
109-
ip_configuration_name = var.database.scale_out && var.database_dual_nics? azurerm_network_interface.nics_dbnodes_admin[count.index].ip_configuration[0].name : azurerm_network_interface.nics_dbnodes_db[count.index].ip_configuration[0].name
108+
network_interface_id = var.database.scale_out && var.database_dual_nics && var.NFS_provider == "ANF" ? azurerm_network_interface.nics_dbnodes_admin[count.index].id : azurerm_network_interface.nics_dbnodes_db[count.index].id
109+
ip_configuration_name = var.database.scale_out && var.database_dual_nics && var.NFS_provider == "ANF" ? azurerm_network_interface.nics_dbnodes_admin[count.index].ip_configuration[0].name : azurerm_network_interface.nics_dbnodes_db[count.index].ip_configuration[0].name
110110
backend_address_pool_id = azurerm_lb_backend_address_pool.hdb[0].id
111111
}
112112

deploy/terraform/terraform-units/modules/sap_system/hdb_node/variables_local.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ locals {
178178
var.naming.separator,
179179
local.resource_suffixes.db_alb_feip
180180
)
181-
subnet_id = var.database.scale_out ? (
181+
subnet_id = var.database.scale_out && var.database_dual_nics && var.NFS_provider == "ANF" ? (
182182
try(
183183
var.admin_subnet.id,
184184
var.landscape_tfstate.admin_subnet_id
@@ -190,7 +190,7 @@ locals {
190190
var.database.use_DHCP ? (
191191
null) : (
192192
cidrhost(
193-
var.database.scale_out ? var.admin_subnet.address_prefixes[0] : var.db_subnet.address_prefixes[0],
193+
var.database.scale_out && var.database_dual_nics && var.NFS_provider == "ANF" ? var.admin_subnet.address_prefixes[0] : var.db_subnet.address_prefixes[0],
194194
local.hdb_ip_offsets.hdb_lb
195195
))
196196
)
@@ -203,7 +203,7 @@ locals {
203203
var.naming.separator,
204204
try(local.resource_suffixes.db_rlb_feip, "dbRlb-feip")
205205
)
206-
subnet_id = var.database.scale_out ? (
206+
subnet_id = var.database.scale_out && var.database_dual_nics && var.NFS_provider == "ANF" ? (
207207
try(
208208
var.admin_subnet.id,
209209
var.landscape_tfstate.admin_subnet_id
@@ -215,7 +215,7 @@ locals {
215215
var.database.use_DHCP ? (
216216
null) : (
217217
cidrhost(
218-
var.database.scale_out ? var.admin_subnet.address_prefixes[0] : var.db_subnet.address_prefixes[0],
218+
var.database.scale_out && var.database_dual_nics && var.NFS_provider == "ANF" ? var.admin_subnet.address_prefixes[0] : var.db_subnet.address_prefixes[0],
219219
local.hdb_ip_offsets.hdb_lb + 1
220220
))
221221
)

0 commit comments

Comments
 (0)