Skip to content

Commit 7cce7cc

Browse files
bganapabganapa
authored
Merge pull request #113 from viananth/viananth-patch
Update repo Readme.mds to use 1.2.9 Version & Remove unsupported parameters
2 parents 9452c7a + 54a632c commit 7cce7cc

8 files changed

Lines changed: 29 additions & 16 deletions

File tree

‎CanaryValidator/Canary.Tests.ps1‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,13 @@ while ($runCount -le $NumberOfIterations)
180180
$asToken = NewAzureStackToken -AADTenantId $AADTenantId -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndpoint
181181
$defaultSubscription = Get-AzureRmSubscription -SubscriptionName "Default Provider Subscription" -ErrorAction Stop
182182
$asCanaryQuotas = NewAzureStackDefaultQuotas -ResourceLocation $ResourceLocation -SubscriptionId $defaultSubscription.SubscriptionId -AADTenantID $AADTenantID -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndPoint
183-
New-AzureRMPlan -Name $tenantPlanName -DisplayName $tenantPlanName -ArmLocation $ResourceLocation -ResourceGroup $subscriptionRGName -SubscriptionId $defaultSubscription.SubscriptionId -AdminUri $AdminArmEndPoint -Token $asToken -QuotaIds $asCanaryQuotas -ErrorAction Stop
183+
if((Get-Module AzureStack).Version -ge [System.Version] "1.2.9")
184+
{
185+
New-AzureRMPlan -Name $tenantPlanName -DisplayName $tenantPlanName -ArmLocation $ResourceLocation -ResourceGroup $subscriptionRGName -QuotaIds $asCanaryQuotas -ErrorAction Stop
186+
}
187+
else {
188+
New-AzureRMPlan -Name $tenantPlanName -DisplayName $tenantPlanName -ArmLocation $ResourceLocation -ResourceGroup $subscriptionRGName -SubscriptionId $defaultSubscription.SubscriptionId -AdminUri $AdminArmEndPoint -Token $asToken -QuotaIds $asCanaryQuotas -ErrorAction Stop
189+
}
184190
}
185191

186192
Invoke-Usecase -Name 'CreateTenantOffer' -Description "Create a tenant offer" -UsecaseBlock `

‎CanaryValidator/README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@ cd AzureStack-Tools-master\CanaryValidator
1414

1515
# To execute Canary as Tenant Administrator
1616
```powershell
17-
# Install-Module AzureRM -RequiredVersion 1.2.8 -Force
18-
# Install-Module AzureStack -RequiredVersion 1.2.8 -Force
17+
# Install-Module -Name 'AzureRm.Bootstrapper' -Force
18+
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force
19+
# Install-Module AzureStack -RequiredVersion 1.2.9 -Force
1920
$TenantAdminCreds = New-Object System.Management.Automation.PSCredential "<Tenant Admin username>", (ConvertTo-SecureString "<Tenant Admin password>" -AsPlainText -Force)
2021
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
2122
.\Canary.Tests.ps1 -AADTenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>" -TenantAdminCredentials $TenantAdminCreds
2223
```
2324

2425
# To execute Canary as Service Administrator
2526
```powershell
26-
# Install-Module AzureRM -RequiredVersion 1.2.8 -Force
27-
# Install-Module AzureStack -RequiredVersion 1.2.8 -Force
27+
# Install-Module -Name 'AzureRm.Bootstrapper' -Force
28+
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force
29+
# Install-Module AzureStack -RequiredVersion 1.2.9 -Force
2830
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
2931
.\Canary.Tests.ps1 -AADTenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>"
3032
```

‎ComputeAdmin/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Instructions below are relative to the .\ComputeAdmin folder of the [AzureStack-
44
Make sure you have the following module prerequisites installed:
55

66
```powershell
7-
Install-Module -Name AzureRM -RequiredVersion 1.2.8 -Scope CurrentUser
8-
Install-Module -Name AzureStack -RequiredVersion 1.2.8 -Scope CurrentUser
7+
Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
8+
Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
9+
Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
910
```
1011
Then make sure the following modules are imported:
1112

‎Connect/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
As a prerequisite, make sure that you installed the correct PowerShell modules and versions:
22

33
```powershell
4-
Install-Module -Name AzureRM -RequiredVersion 1.2.8 -Scope CurrentUser
5-
Install-Module -Name AzureStack -RequiredVersion 1.2.8 -Scope CurrentUser
4+
Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
5+
Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
6+
Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
67
```
78

89
This tool set allows you to connect to an Azure Stack PoC (Proof of Concept) instance from an external personal laptop. You can then access the portal or log into that environment via PowerShell.

‎Identity/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Azure Stack Identity
22

33
```powershell
4-
Install-Module -Name AzureRM -RequiredVersion 1.2.8 -Scope CurrentUser
5-
Install-Module -Name AzureStack -RequiredVersion 1.2.8 -Scope CurrentUser
4+
Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
5+
Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
6+
Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
67
```
78
Then make sure the following modules are imported:
89

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ To use these tools, obtain Azure Stack compatible Azure PowerShell module. Unles
99
For PowerShell, install the following:
1010

1111
```powershell
12-
Install-Module -Name AzureRM -RequiredVersion 1.2.8 -Scope CurrentUser
13-
Install-Module -Name AzureStack -RequiredVersion 1.2.8 -Scope CurrentUser
12+
Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
13+
Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
14+
Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
1415
```
1516

1617
Obtain the tools by cloning the git repository.

‎ServiceAdmin/AzureStack.ServiceAdmin.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function New-AzSTenantOfferAndQuotas
4444
New-AzureRmResourceGroup -Name $Name -Location $Location -ErrorAction Stop
4545

4646
Write-Verbose "Creating plan..." -Verbose
47-
$plan = New-AzureRMPlan -Name $Name -DisplayName $Name -ArmLocation $Location -ResourceGroup $Name -SubscriptionId $subscription -QuotaIds $Quotas
47+
$plan = New-AzureRMPlan -Name $Name -DisplayName $Name -ArmLocation $Location -ResourceGroup $Name -QuotaIds $Quotas
4848

4949
Write-Verbose "Creating public offer..." -Verbose
5050
$offer = New-AzureRMOffer -Name $Name -DisplayName $Name -State Public -BasePlanIds @($plan.Id) -ArmLocation $Location -ResourceGroup $Name

‎ServiceAdmin/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ Instructions below are relative to the .\ServiceAdmin folder of the [AzureStack-
55
Make sure you have the following module prerequisites installed:
66

77
```powershell
8-
Install-Module -Name AzureRM -RequiredVersion 1.2.8 -Scope CurrentUser
9-
Install-Module -Name AzureStack -RequiredVersion 1.2.8 -Scope CurrentUser
8+
Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
9+
Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
10+
Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
1011
```
1112
Then make sure the following modules are imported:
1213

0 commit comments

Comments
 (0)