Skip to content

[Fixes] Virtual Machine - fixed the subnetId (should be subnetResourceId) old reference for the… #2120

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.

Sign up for GitHub

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

Merged
MariusStorhaug merged 17 commits into from
Sep 25, 2022
Merged

[Fixes] Virtual Machine - fixed the subnetId (should be subnetResourceId) old reference for the… #2120

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
97fa4c3
fixed the subnetId (should be subnetResourceId) old reference for the…
oliverlabs Sep 23, 2022
92a3520
Hub&Spoke
oliverlabs Sep 23, 2022
94a1739
adding the /solutions folder
oliverlabs Sep 23, 2022
1397cc5
Merge branch 'main' of https://github.com/oliverlabs/CARMLResourceMod…
oliverlabs Sep 23, 2022
e01ae48
Update azure-pipelines.yml for Azure Pipelines
oliverlabs Sep 23, 2022
42aa5fc
added jobs.solutionDeployment.yml
oliverlabs Sep 23, 2022
ced2cbe
added own service connection name
oliverlabs Sep 23, 2022
b5c9c05
added own service connection name
oliverlabs Sep 23, 2022
34e000c
updated subscription id
oliverlabs Sep 23, 2022
1a445f4
location changed to westeurope
oliverlabs Sep 23, 2022
899e4dd
changed to a personal sub
oliverlabs Sep 23, 2022
b598674
moved changed made throughout a day to a different branch
oliverlabs Sep 23, 2022
362bc4b
removed extra files modified during the day
oliverlabs Sep 23, 2022
d0e5935
Update .vscode/settings.json
oliverlabs Sep 25, 2022
47c2237
regenerated readme.md and avoided auto LF to CRLF
oliverlabs Sep 25, 2022
d724b37
Merge branch 'main' of https://github.com/oliverlabs/CARMLResourceMod…
oliverlabs Sep 25, 2022
6d4bd58
Update .vscode/settings.json
MariusStorhaug Sep 25, 2022
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
21 changes: 12 additions & 9 deletions modules/Microsoft.Compute/virtualMachines/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ This module deploys one Virtual Machine with one or multiple nics and optionally
## Parameters

**Required parameters**

| Parameter Name | Type | Default Value | Allowed Values | Description |
| :-- | :-- | :-- | :-- | :-- |
| `adminUsername` | secureString | | | Administrator username. |
Expand All @@ -39,6 +40,7 @@ This module deploys one Virtual Machine with one or multiple nics and optionally
| `vmSize` | string | | | Specifies the size for the VMs. |

**Optional parameters**

| Parameter Name | Type | Default Value | Allowed Values | Description |
| :-- | :-- | :-- | :-- | :-- |
| `additionalUnattendContent` | array | `[]` | | Specifies additional base-64 encoded XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup. - AdditionalUnattendContent object. |
Expand Down Expand Up @@ -107,6 +109,7 @@ This module deploys one Virtual Machine with one or multiple nics and optionally
| `winRM` | object | `{object}` | | Specifies the Windows Remote Management listeners. This enables remote Windows PowerShell. - WinRMConfiguration object. |

**Generated parameters**

| Parameter Name | Type | Default Value | Description |
| :-- | :-- | :-- | :-- |
| `baseTime` | string | `[utcNow('u')]` | Do not provide a value! This date value is used to generate a registration token. |
Expand Down Expand Up @@ -319,7 +322,7 @@ dataDisks: [
### Parameter Usage: `nicConfigurations`

Comments:
- The field `nicSuffix` and `subnetId` are mandatory.
- The field `nicSuffix` and `subnetResourceId` are mandatory.
- If `enablePublicIP` is set to true, then `publicIpNameSuffix` is also mandatory.
- Each IP config needs to have the mandatory field `name`.
- If not disabled, `enableAcceleratedNetworking` is considered `true` by default and requires the VM to be deployed with a supported OS and VM size.
Expand All @@ -337,7 +340,7 @@ Comments:
"ipConfigurations": [
{
"name": "ipconfig1",
"subnetId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"subnetResourceId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"pipConfiguration": {
"publicIpNameSuffix": "-pip-01",
"roleAssignments": [
Expand All @@ -352,7 +355,7 @@ Comments:
},
{
"name": "ipconfig2",
"subnetId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"subnetResourceId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
}
],
"nsgId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/networkSecurityGroups/<nsgName>",
Expand All @@ -370,14 +373,14 @@ Comments:
"ipConfigurations": [
{
"name": "ipconfig1",
"subnetId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"subnetResourceId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"pipConfiguration": {
"publicIpNameSuffix": "-pip-02"
}
},
{
"name": "ipconfig2",
"subnetId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"subnetResourceId": "/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>",
"privateIPAllocationMethod": "Static",
"privateIPAddress": "10.0.0.9"
}
Expand All @@ -402,7 +405,7 @@ nicConfigurations: {
ipConfigurations: [
{
name: 'ipconfig1'
subnetId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
subnetResourceId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
pipConfiguration: {
publicIpNameSuffix: '-pip-01'
roleAssignments: [
Expand All @@ -417,7 +420,7 @@ nicConfigurations: {
}
{
name: 'ipconfig2'
subnetId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
subnetResourceId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
}
]
nsgId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/networkSecurityGroups/<nsgName>'
Expand All @@ -435,14 +438,14 @@ nicConfigurations: {
ipConfigurations: [
{
name: 'ipconfig1'
subnetId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
subnetResourceId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
pipConfiguration: {
publicIpNameSuffix: '-pip-02'
}
}
{
name: 'ipconfig2'
subnetId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
subnetResourceId: '/subscriptions/<subscriptionId>/resourceGroups/<resourceGroupName>/providers/Microsoft.Network/virtualNetworks/<vNetName>/subnets/<subnetName>'
privateIPAllocationMethod: 'Static'
privateIPAddress: '10.0.0.9'
}
Expand Down