Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes] VM - Update NIC IP Address handover #1677

Merged
merged 5 commits into from
Jul 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ module networkInterface '../../../Microsoft.Network/networkInterfaces/deploy.bic
name: !empty(ipConfiguration.name) ? ipConfiguration.name : null
primary: index == 0
privateIPAllocationMethod: contains(ipConfiguration, 'privateIPAllocationMethod') ? (!empty(ipConfiguration.privateIPAllocationMethod) ? ipConfiguration.privateIPAllocationMethod : null) : null
privateIPAddress: contains(ipConfiguration, 'vmIPAddress') ? (!empty(ipConfiguration.vmIPAddress) ? ipConfiguration.vmIPAddress : null) : null
privateIPAddress: contains(ipConfiguration, 'privateIPAddress') ? (!empty(ipConfiguration.privateIPAddress) ? ipConfiguration.privateIPAddress : null) : null
publicIPAddressResourceId: contains(ipConfiguration, 'pipconfiguration') ? resourceId('Microsoft.Network/publicIPAddresses', '${virtualMachineName}${ipConfiguration.pipconfiguration.publicIpNameSuffix}') : null
subnetId: ipConfiguration.subnetId
loadBalancerBackendAddressPools: contains(ipConfiguration, 'loadBalancerBackendAddressPools') ? ipConfiguration.loadBalancerBackendAddressPools : null
Expand Down
4 changes: 2 additions & 2 deletions modules/Microsoft.Compute/virtualMachines/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ Comments:
"name": "ipconfig2",
"subnetId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"privateIPAllocationMethod": "Static",
"vmIPAddress": "10.0.0.9"
"privateIPAddress": "10.0.0.9"
}
]
}
Expand Down Expand Up @@ -443,7 +443,7 @@ nicConfigurations: {
name: 'ipconfig2'
subnetId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
privateIPAllocationMethod: 'Static'
vmIPAddress: '10.0.0.9'
privateIPAddress: '10.0.0.9'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion modules/Microsoft.Network/networkInterfaces/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2021-05-01' = {
properties: {
primary: index == 0 ? true : false
privateIPAllocationMethod: contains(ipConfiguration, 'privateIPAllocationMethod') ? (!empty(ipConfiguration.privateIPAllocationMethod) ? ipConfiguration.privateIPAllocationMethod : null) : null
privateIPAddress: contains(ipConfiguration, 'vmIPAddress') ? (!empty(ipConfiguration.vmIPAddress) ? ipConfiguration.vmIPAddress : null) : null
privateIPAddress: contains(ipConfiguration, 'privateIPAddress') ? (!empty(ipConfiguration.privateIPAddress) ? ipConfiguration.privateIPAddress : null) : null
AlexanderSehr marked this conversation as resolved.
Show resolved Hide resolved
publicIPAddress: contains(ipConfiguration, 'publicIPAddressResourceId') ? (ipConfiguration.publicIPAddressResourceId != null ? {
id: ipConfiguration.publicIPAddressResourceId
} : null) : null
Expand Down