Skip to content

Commit 547fcee

Browse files
author
BradleyBartlett
committed
registration typo fixes and version checking for registering resource provider
1 parent ab90282 commit 547fcee

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Registration/RegisterWithAzure.psm1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,15 @@ function RegistrationWorker{
619619
$resourceGroup = New-AzureRmResourceGroup -Name $ResourceGroupName -Location $ResourceGroupLocation -Force
620620

621621
Log-Output "Registering Azure Stack resource provider."
622-
Register-AzureRmResourceProvider -ProviderNamespace "Microsoft.AzureStack" -Force | Out-Null
622+
[Version]$azurePSVersion = (Get-Module AzureRm.Resources).Version
623+
if ($azurePSVersion -ge [Version]"4.3.2")
624+
{
625+
Register-AzureRmResourceProvider -ProviderNamespace "Microsoft.AzureStack" | Out-Null
626+
}
627+
else
628+
{
629+
Register-AzureRmResourceProvider -ProviderNamespace "Microsoft.AzureStack" -Force | Out-Null
630+
}
623631

624632
$RegistrationName = if ($RegistrationName) { $RegistrationName } else { "AzureStack-$($stampInfo.CloudID)" }
625633

@@ -633,7 +641,7 @@ function RegistrationWorker{
633641
Properties = @{ registrationToken = "$registrationToken" }
634642
}
635643

636-
$registrationResource = New-AzureRmResource @resourceActionparams -Force
644+
$registrationResource = New-AzureRmResource @resourceCreationParams -Force
637645

638646
Log-Output "Registration resource: $(ConvertTo-Json $registrationResource)"
639647

0 commit comments

Comments
 (0)