Skip to content
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
8 changes: 7 additions & 1 deletion CanaryValidator/Canary.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,13 @@ while ($runCount -le $NumberOfIterations)
$asToken = NewAzureStackToken -AADTenantId $AADTenantId -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndpoint
$defaultSubscription = Get-AzureRmSubscription -SubscriptionName "Default Provider Subscription" -ErrorAction Stop
$asCanaryQuotas = NewAzureStackDefaultQuotas -ResourceLocation $ResourceLocation -SubscriptionId $defaultSubscription.SubscriptionId -AADTenantID $AADTenantID -EnvironmentDomainFQDN $EnvironmentDomainFQDN -Credentials $ServiceAdminCredentials -ArmEndPoint $AdminArmEndPoint
New-AzureRMPlan -Name $tenantPlanName -DisplayName $tenantPlanName -ArmLocation $ResourceLocation -ResourceGroup $subscriptionRGName -SubscriptionId $defaultSubscription.SubscriptionId -AdminUri $AdminArmEndPoint -Token $asToken -QuotaIds $asCanaryQuotas -ErrorAction Stop
if((Get-Module AzureStack).Version -ge [System.Version] "1.2.9")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If Part is good enough

{
New-AzureRMPlan -Name $tenantPlanName -DisplayName $tenantPlanName -ArmLocation $ResourceLocation -ResourceGroup $subscriptionRGName -QuotaIds $asCanaryQuotas -ErrorAction Stop
}
else {
New-AzureRMPlan -Name $tenantPlanName -DisplayName $tenantPlanName -ArmLocation $ResourceLocation -ResourceGroup $subscriptionRGName -SubscriptionId $defaultSubscription.SubscriptionId -AdminUri $AdminArmEndPoint -Token $asToken -QuotaIds $asCanaryQuotas -ErrorAction Stop
}
}

Invoke-Usecase -Name 'CreateTenantOffer' -Description "Create a tenant offer" -UsecaseBlock `
Expand Down
10 changes: 6 additions & 4 deletions CanaryValidator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ cd AzureStack-Tools-master\CanaryValidator

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

# To execute Canary as Service Administrator
```powershell
# Install-Module AzureRM -RequiredVersion 1.2.8 -Force
# Install-Module AzureStack -RequiredVersion 1.2.8 -Force
# Install-Module -Name 'AzureRm.Bootstrapper' -Force
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force
# Install-Module AzureStack -RequiredVersion 1.2.9 -Force
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
.\Canary.Tests.ps1 -AADTenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>"
```
Expand Down
5 changes: 3 additions & 2 deletions ComputeAdmin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ Instructions below are relative to the .\ComputeAdmin folder of the [AzureStack-
Make sure you have the following module prerequisites installed:

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

Expand Down
5 changes: 3 additions & 2 deletions Connect/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
As a prerequisite, make sure that you installed the correct PowerShell modules and versions:

```powershell
Install-Module -Name AzureRM -RequiredVersion 1.2.8 -Scope CurrentUser
Install-Module -Name AzureStack -RequiredVersion 1.2.8 -Scope CurrentUser
Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
```

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.
Expand Down
5 changes: 3 additions & 2 deletions Identity/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Azure Stack Identity

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

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ To use these tools, obtain Azure Stack compatible Azure PowerShell module. Unles
For PowerShell, install the following:

```powershell
Install-Module -Name AzureRM -RequiredVersion 1.2.8 -Scope CurrentUser
Install-Module -Name AzureStack -RequiredVersion 1.2.8 -Scope CurrentUser
Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
```

Obtain the tools by cloning the git repository.
Expand Down
2 changes: 1 addition & 1 deletion ServiceAdmin/AzureStack.ServiceAdmin.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function New-AzSTenantOfferAndQuotas
New-AzureRmResourceGroup -Name $Name -Location $Location -ErrorAction Stop

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

Write-Verbose "Creating public offer..." -Verbose
$offer = New-AzureRMOffer -Name $Name -DisplayName $Name -State Public -BasePlanIds @($plan.Id) -ArmLocation $Location -ResourceGroup $Name
Expand Down
5 changes: 3 additions & 2 deletions ServiceAdmin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ Instructions below are relative to the .\ServiceAdmin folder of the [AzureStack-
Make sure you have the following module prerequisites installed:

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

Expand Down