diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep b/modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep index 7bb0876f37..e2ae8e13a7 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep @@ -86,7 +86,7 @@ param licenseType string = '' @description('Optional. Specifies if Windows VM disks should be encrypted with Server-side encryption + Customer managed Key.') param enableServerSideEncryption bool = false -@description('Optional. Required if domainName is specified. Password of the user specified in domainJoinUser parameter.') +@description('Optional. Required if name is specified. Password of the user specified in user parameter.') @secure() param extensionDomainJoinPassword string = '' diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md b/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md index 4382c2a1c1..e94bd0616a 100644 --- a/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md +++ b/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md @@ -70,7 +70,7 @@ The following resources are required to be able to deploy this resource. | `extensionDependencyAgentConfig` | object | `{object}` | | The configuration for the [Dependency Agent] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionDiskEncryptionConfig` | object | `{object}` | | The configuration for the [Disk Encryption] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionDomainJoinConfig` | object | `{object}` | | The configuration for the [Domain Join] extension. Must at least contain the ["enabled": true] property to be executed. | -| `extensionDomainJoinPassword` | secureString | `''` | | Required if domainName is specified. Password of the user specified in domainJoinUser parameter. | +| `extensionDomainJoinPassword` | secureString | `''` | | Required if name is specified. Password of the user specified in user parameter. | | `extensionDSCConfig` | object | `{object}` | | The configuration for the [Desired State Configuration] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionMonitoringAgentConfig` | object | `{object}` | | The configuration for the [Monitoring Agent] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionNetworkWatcherAgentConfig` | object | `{object}` | | The configuration for the [Network Watcher Agent] extension. Must at least contain the ["enabled": true] property to be executed. | @@ -386,11 +386,11 @@ nicConfigurations: [ "value": { "enabled": true, "settings": { - "domainName": "contoso.com", - "domainJoinUser": "test.user@testcompany.com", - "domainJoinOU": "OU=testOU; DC=contoso; DC=com", - "domainJoinRestart": true, - "domainJoinOptions": 3 + "name": "contoso.com", + "user": "test.user@testcompany.com", + "ouPath": "OU=testOU; DC=contoso; DC=com", + "restart": true, + "options": 3 } } }, @@ -412,11 +412,11 @@ nicConfigurations: [ extensionDomainJoinConfig: { enabled: true settings: { - domainName: 'contoso.com' - domainJoinUser: 'test.user@testcompany.com' - domainJoinOU: 'OU=testOU; DC=contoso; DC=com' - domainJoinRestart: true - domainJoinOptions: 3 + name: 'contoso.com' + user: 'test.user@testcompany.com' + ouPath: 'OU=testOU; DC=contoso; DC=com' + restart: true + options: 3 } } diff --git a/modules/Microsoft.Compute/virtualMachines/deploy.bicep b/modules/Microsoft.Compute/virtualMachines/deploy.bicep index 48b1d38db8..ba7873fb48 100644 --- a/modules/Microsoft.Compute/virtualMachines/deploy.bicep +++ b/modules/Microsoft.Compute/virtualMachines/deploy.bicep @@ -166,7 +166,7 @@ param enableServerSideEncryption bool = false @description('Optional. Specifies whether extension operations should be allowed on the virtual machine. This may only be set to False when no extensions are present on the virtual machine.') param allowExtensionOperations bool = true -@description('Optional. Required if domainName is specified. Password of the user specified in domainJoinUser parameter.') +@description('Optional. Required if name is specified. Password of the user specified in user parameter.') @secure() param extensionDomainJoinPassword string = '' diff --git a/modules/Microsoft.Compute/virtualMachines/readme.md b/modules/Microsoft.Compute/virtualMachines/readme.md index 879651cd8a..83569edd7f 100644 --- a/modules/Microsoft.Compute/virtualMachines/readme.md +++ b/modules/Microsoft.Compute/virtualMachines/readme.md @@ -72,7 +72,7 @@ This module deploys one Virtual Machine with one or multiple nics and optionally | `extensionDependencyAgentConfig` | object | `{object}` | | The configuration for the [Dependency Agent] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionDiskEncryptionConfig` | object | `{object}` | | The configuration for the [Disk Encryption] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionDomainJoinConfig` | object | `{object}` | | The configuration for the [Domain Join] extension. Must at least contain the ["enabled": true] property to be executed. | -| `extensionDomainJoinPassword` | secureString | `''` | | Required if domainName is specified. Password of the user specified in domainJoinUser parameter. | +| `extensionDomainJoinPassword` | secureString | `''` | | Required if name is specified. Password of the user specified in user parameter. | | `extensionDSCConfig` | object | `{object}` | | The configuration for the [Desired State Configuration] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionMonitoringAgentConfig` | object | `{object}` | | The configuration for the [Monitoring Agent] extension. Must at least contain the ["enabled": true] property to be executed. | | `extensionNetworkWatcherAgentConfig` | object | `{object}` | | The configuration for the [Network Watcher Agent] extension. Must at least contain the ["enabled": true] property to be executed. | @@ -496,11 +496,11 @@ configurationProfileAssignments: [ "value": { "enabled": true, "settings": { - "domainName": "contoso.com", - "domainJoinUser": "test.user@testcompany.com", - "domainJoinOU": "OU=testOU; DC=contoso; DC=com", - "domainJoinRestart": true, - "domainJoinOptions": 3 + "name": "contoso.com", + "user": "test.user@testcompany.com", + "ouPath": "OU=testOU; DC=contoso; DC=com", + "restart": true, + "options": 3 } } }, @@ -522,11 +522,11 @@ configurationProfileAssignments: [ extensionDomainJoinConfig: { enabled: true settings: { - domainName: 'contoso.com' - domainJoinUser: 'test.user@testcompany.com' - domainJoinOU: 'OU=testOU; DC=contoso; DC=com' - domainJoinRestart: true - domainJoinOptions: 3 + name: 'contoso.com' + user: 'test.user@testcompany.com' + ouPath: 'OU=testOU; DC=contoso; DC=com' + restart: true + options: 3 } }