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

Hcibox23h2 merge #2362

Merged
merged 3 commits into from
Jan 19, 2024
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
5 changes: 1 addition & 4 deletions azure_jumpstart_hcibox/artifacts/PowerShell/Bootstrap.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,9 @@ Invoke-WebRequest "https://raw.githubusercontent.com/microsoft/azure_arc/main/im
Invoke-WebRequest https://aka.ms/wacdownload -OutFile "$($HCIBoxConfig.Paths["WACDir"])\WindowsAdminCenter.msi"
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/HCIBoxLogonScript.ps1") -OutFile $HCIPath\HCIBoxLogonScript.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/New-HCIBoxCluster.ps1") -OutFile $HCIPath\New-HCIBoxCluster.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Register-AzSHCI.ps1") -OutFile $HCIPath\Register-AzSHCI.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Configure-AKS.ps1") -OutFile $HCIPath\Deploy-AKS.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Deploy-SQLMI.ps1") -OutFile $HCIPath\Deploy-SQLMI.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Uninstall-AKS.ps1") -OutFile $HCIPath\Uninstall-AKS.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Deploy-ArcResourceBridge.ps1") -OutFile $HCIPath\Deploy-ArcResourceBridge.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Uninstall-ResourceBridge.ps1") -OutFile $HCIPath\Uninstall-ResourceBridge.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Configure-VMManagement.ps1") -OutFile $HCIPath\Deploy-ArcResourceBridge.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Deploy-GitOps.ps1") -OutFile $HCIPath\Deploy-GitOps.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/Cloud-Cluster-Deploy.ps1") -OutFile $HCIPath\Cloud-Cluster-Deploy.ps1
Invoke-WebRequest ($templateBaseUrl + "artifacts/PowerShell/GetServiceAccountBearerToken.ps1") -OutFile $HCIPath\GetServiceAccountBearerToken.ps1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $Env:HCIBoxDir = "C:\HCIBox"

# Import Configuration Module
$HCIBoxConfig = Import-PowerShellDataFile -Path $Env:HCIBoxConfigFile
Start-Transcript -Path "$($HCIBoxConfig.Paths.LogsDir)\Deploy-ArcResourceBridge.log"
Start-Transcript -Path "$($HCIBoxConfig.Paths.LogsDir)\Configure-VMManagement.log"

#$csv_path = $HCIBoxConfig.ClusterSharedVolumePath

Expand Down Expand Up @@ -43,8 +43,9 @@ az stack-hci-vm image create --subscription $env:subscriptionId --resource-group
# Create logical networks
$switchName='"ConvergedSwitch(hci)"'
$lnetName = "myhci-lnet-static"
$addressPrefixes = "192.168.10.0/24"
$addressPrefixes = "192.168.200.0/24"
$gateway = "192.168.1.1"
$dnsServers = "192.168.1.254"
$vlanid = "200"

az stack-hci-vm network lnet create --subscription $env:subscriptionId --resource-group $env:resourceGroup --custom-location $customLocationID --location $location --name $lnetName --vm-switch-name $switchName --ip-allocation-method "Static" --address-prefixes $addressPrefixes --gateway $gateway --dns-servers $dnsServers
az stack-hci-vm network lnet create --subscription $env:subscriptionId --resource-group $env:resourceGroup --custom-location $customLocationID --location $location --name $lnetName --vm-switch-name $switchName --ip-allocation-method "Static" --address-prefixes $addressPrefixes --gateway $gateway --dns-servers $dnsServers -vlanid $vlanid
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $Env:HCIBoxDir = "C:\HCIBox"

# Import Configuration Module
$HCIBoxConfig = Import-PowerShellDataFile -Path $Env:HCIBoxConfigFile
Start-Transcript -Path "$($HCIBoxConfig.Paths.LogsDir)\Cloud-Cluster-Deploy.log"
Start-Transcript -Path "$($HCIBoxConfig.Paths.LogsDir)\Generate-ARM-Template.log"

# Connect to Azure
Write-Host 'Creating credentials and connecting to Azure'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
FabricSwitch = "vSwitch-Fabric"
FabricNIC = "FABRIC"
ClusterVSwitchName = "hciSwitch"
ClusterName = "hciboxcluster"
ClusterName = "hciboxcluster3"
WACVMName = "AdminCenter"
ClusterSharedVolumePath = "C:\ClusterStorage\S2D_vDISK1"
LCMDeployUsername = "HCIBoxDeployUser"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Stop-Transcript
# Build HCI cluster
& "$Env:HCIBoxDir\New-HCIBoxCluster.ps1"

& "$Env:HCIBoxDir\Cloud-Cluster-Deploy.ps1"
& "$Env:HCIBoxDir\Generate-ARM-Template.ps1"

Start-Transcript -Append -Path $Env:HCIBoxLogsDir\HCIBoxLogonScript.log

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1594,6 +1594,12 @@ function Set-HCIDeployPrereqs {
Invoke-AzStackHciArcInitialization -SubscriptionID $subId -ResourceGroup $resourceGroup -TenantID $tenantId -Region eastus -Cloud "AzureCloud" -ArmAccessToken $armtoken.Token -AccountID $clientId
}
}
# Workaround for incomplete BITS transfer of LCM files
Start-Sleep -Seconds 60
Invoke-Command -VMName $HCIBoxconfig.NodeHostConfig[0].Hostname {
Remove-Item -Path "C:\DeploymentPackage" -Recurse -Force
Restart-Computer -Force
}
}

#endregion
Expand Down