Skip to content

Commit 6b3329b

Browse files
Merge pull request #3315 from MicrosoftDocs/main638621047441077872sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents d7b5f1c + d269da5 commit 6b3329b

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

azure-stack/hci/deploy/deployment-arc-register-server-permissions.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ Before you begin, make sure you've completed the following prerequisites:
5757
> [!IMPORTANT]
5858
> Run these steps on every Azure Stack HCI server that you intend to cluster.
5959
60-
<!-- 1. Install the [Arc registration script](https://www.powershellgallery.com/packages/AzSHCI.ARCInstaller) from PSGallery.
60+
1. Install the [Arc registration script](https://www.powershellgallery.com/packages/AzSHCI.ARCInstaller) from PSGallery. **This step is only required if you're using an OS ISO that's older than 2408**. For more information, see [What's new in 2408](../whats-new.md#features-and-improvements-in-2408).
6161

6262
# [PowerShell](#tab/powershell)
6363
```powershell
6464
#Register PSGallery as a trusted repo
6565
Register-PSRepository -Default -InstallationPolicy Trusted
6666
6767
#Install required PowerShell modules in your node for registration
68-
Install-Module Az.Accounts -RequiredVersion 2.13.2
68+
Install-Module Az.Accounts -RequiredVersion 3.0.0
6969
Install-Module Az.Resources -RequiredVersion 6.12.0
70-
Install-Module Az.ConnectedMachine -RequiredVersion 0.5.2
70+
Install-Module Az.ConnectedMachine -RequiredVersion 0.8.0
7171
7272
7373
#Install Arc registration script from PSGallery
@@ -77,9 +77,9 @@ Before you begin, make sure you've completed the following prerequisites:
7777
Here's a sample output of the installation:
7878
7979
```output
80-
PS C:\Users\SetupUser> Install-Module Az.Accounts -RequiredVersion 2.13.2
80+
PS C:\Users\SetupUser> Install-Module Az.Accounts -RequiredVersion 3.0.0
8181
PS C:\Users\SetupUser> Install-Module Az.Resources -RequiredVersion 6.12.0
82-
PS C:\Users\SetupUser> Install-Module Az.ConnectedMachine -RequiredVersion 0.5.2
82+
PS C:\Users\SetupUser> Install-Module Az.ConnectedMachine -RequiredVersion 0.8.0
8383
PS C:\Users\SetupUser> Install-Module -Name AzSHCI.ARCInstaller
8484
NuGet provider is required to continue
8585
PowerShellGet requires NuGet provider version '2.8.5.201' or newer to interact with NuGet-based repositories. The NuGet provider must be available in 'C:\Program Files\PackageManagement\ProviderAssemblies' or
@@ -89,7 +89,7 @@ Before you begin, make sure you've completed the following prerequisites:
8989
[Y] Yes [N] No [S] Suspend [?] Help (default is "Y"): Y
9090
PS C:\Users\SetupUser>
9191
```
92-
--- -->
92+
9393
1. Set the parameters. The script takes in the following parameters:
9494
9595
|Parameters |Description |

azure-stack/hci/deploy/deployment-install-os.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ Follow these steps to configure the operating system using SConfig:
139139
> - Make sure that the local administrator password follows Azure password length and complexity requirements. Use a password that is at least 12 characters long and contains a lowercase character, an uppercase character, a numeral, and a special character.
140140
> - Do not join the servers with the Azure Stack HCI operating system installed, to the Active Directory domain prior to cloud deployment. Cluster nodes are automatically joined to a domain during the [Deployment via Azure portal](./deploy-via-portal.md).
141141
142-
<!--## Install required Windows roles
142+
## Install required Windows roles
143+
144+
**This step is only required if you're using an OS ISO that's older than 2408**. For more information, see [What's new in 2408](../whats-new.md#features-and-improvements-in-2408).
143145

144146
Install the Hyper-V role. Run the following command on each server of the cluster:
145147

@@ -149,10 +151,9 @@ Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
149151

150152
Your servers will restart; this takes a few minutes.
151153

152-
You are now ready to register the Azure Stack HCI server with Azure Arc and assign permissions for deployment. -->
154+
You are now ready to register the Azure Stack HCI server with Azure Arc and assign permissions for deployment.
153155

154156
## Next steps
155157

156158
- (Optional) [Configure proxy settings for Azure Stack HCI, version 23H2](../manage/configure-proxy-settings-23h2.md).
157-
- [Register Azure Stack HCI servers in your system with Azure Arc and assign permissions](./deployment-arc-register-server-permissions.md).
158-
159+
- [Register Azure Stack HCI servers in your system with Azure Arc and assign permissions](./deployment-arc-register-server-permissions.md).

azure-stack/hci/deploy/deployment-introduction.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ ms.subservice: azure-stack-hci
1515

1616
This article is the first in the series of deployment articles that describe how to deploy Azure Stack HCI, version 23H2. This article applies to both single and multi-node deployments. The target audience for this article is IT administrators who are responsible for deploying Azure Stack HCI in their organization.
1717

18-
[!INCLUDE [important-23h2](../../includes/hci-important-deploy-23h2.md)]
19-
2018
## About deployment methods
2119

2220
In this release, you can deploy Azure Stack HCI using one of the following methods:

0 commit comments

Comments
 (0)