Skip to content

Commit 2542b25

Browse files
authored
Merge pull request #103426 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents adee5f1 + 7d0a141 commit 2542b25

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

articles/automation/automation-dsc-onboarding.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,10 @@ previous keys.
351351
After registering a machine as a DSC node in Azure Automation State Configuration, there are a
352352
number of reasons why you may need to re-register that node in the future:
353353
354-
- For versions of Windows Server prior to Windows Server 2019, each node automatically negotiates a unique certificate for authentication that expires after one year. Currently, the PowerShell DSC registration protocol cannot automatically renew certificates when they are nearing expiration, so you need to re-register the nodes after a year's time. Before re-registering, ensure that each node is running Windows Management Framework 5.0 RTM. If a node's authentication certificate expires, and the node is not re-registered, the node is unable to communicate with Azure Automation and is marked 'Unresponsive.' re-registration performed 90 days or less from the certificate expiration time, or at any point after the certificate expiration time, will result in a new certificate being generated and used. A resolution to this issue is included in Windows Server 2019 and later.
354+
- For versions of Windows Server prior to Windows Server 2019, each node automatically negotiates a unique certificate for authentication that expires after one year. Currently, the PowerShell DSC registration protocol cannot automatically renew certificates when they are nearing expiration, so you need to re-register the nodes after a year's time. Before re-registering, ensure that each node is running Windows Management Framework 5.0 RTM. If a node's authentication certificate expires, and the node is not re-registered, the node is unable to communicate with Azure Automation and is marked 'Unresponsive.' Re-registration performed 90 days or less from the certificate expiration time, or at any point after the certificate expiration time, will result in a new certificate being generated and used. A resolution to this issue is included in Windows Server 2019 and later.
355355
- To change any [PowerShell DSC Local Configuration Manager values](/powershell/scripting/dsc/managing-nodes/metaConfig4) that were set during initial registration of the node, such as ConfigurationMode. Currently, these DSC agent values can only be changed through re-registration. The one exception is the Node Configuration assigned to the node -- this can be changed in Azure Automation DSC directly.
356356
357-
re-registration can be performed in the same way you registered the node initially, using any of the
357+
Re-registration can be performed in the same way you registered the node initially, using any of the
358358
onboarding methods described in this document. You do not need to unregister a node from Azure
359359
Automation State Configuration before re-registering it.
360360

articles/virtual-machines/windows/disk-encryption.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ $diskEncryptionSet=Get-AzDiskEncryptionSet -ResourceGroupName $ResourceGroupName
170170
171171
$vm = Add-AzVMDataDisk -VM $vm -Name $diskName -CreateOption Empty -DiskSizeInGB $diskSizeinGiB -StorageAccountType $diskSKU -Lun $diskLUN -DiskEncryptionSetId $diskEncryptionSet.Id
172172
173-
Update-AzVM -ResourceGroupName $rgName -VM $vm
173+
Update-AzVM -ResourceGroupName $ResourceGroupName -VM $vm
174174
175175
```
176176

0 commit comments

Comments
 (0)