Skip to content

Commit

Permalink
Merge pull request #337 from Azure/azps1211
Browse files Browse the repository at this point in the history
Changes corresponding to PS version 1.2.11
  • Loading branch information
MatthewMcGlynn authored Oct 13, 2017
2 parents cb8a391 + 5841597 commit 405fbcd
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 14 deletions.
8 changes: 4 additions & 4 deletions CanaryValidator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Set-Location -Path ".\AzureStack-Tools-master\CanaryValidator" -PassThru
```powershell
# Install-Module -Name 'AzureRm.Bootstrapper'
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force
# Install-Module -Name AzureStack -RequiredVersion 1.2.10
# Install-Module -Name AzureStack -RequiredVersion 1.2.11
$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 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>" -TenantAdminCredentials $TenantAdminCreds
Expand All @@ -29,7 +29,7 @@ $ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Ser
# Download the WS2016 ISO image from: https://www.microsoft.com/en-us/evalcenter/evaluate-windows-server-2016, and place it on your local machine
# Install-Module -Name 'AzureRm.Bootstrapper'
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force
# Install-Module -Name AzureStack -RequiredVersion 1.2.10
# Install-Module -Name AzureStack -RequiredVersion 1.2.11
$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 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>" -TenantAdminCredentials $TenantAdminCreds -WindowsISOPath "<path where the WS2016 ISO is present>"
Expand All @@ -41,7 +41,7 @@ $ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Ser
```powershell
# Install-Module -Name 'AzureRm.Bootstrapper'
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force
# Install-Module -Name AzureStack -RequiredVersion 1.2.10
# Install-Module -Name AzureStack -RequiredVersion 1.2.11
.\Canary.Tests.ps1 -ListAvailable
Sample output:
Expand Down Expand Up @@ -129,7 +129,7 @@ List of scenarios in Canary:
```powershell
# Install-Module -Name 'AzureRm.Bootstrapper'
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force
# Install-Module -Name AzureStack -RequiredVersion 1.2.10
# Install-Module -Name AzureStack -RequiredVersion 1.2.11
# A new paramter called ExclusionList has been added which is a string array. Pass in the list of usecases you don't want to execute to this parameter.
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
.\Canary.Tests.ps1 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -ExclusionList "ListFabricResourceProviderInfo","ListUpdateResourceProviderInfo"
Expand Down
6 changes: 3 additions & 3 deletions ComputeAdmin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,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.Bootstrapper'
Install-AzureRmProfile -profile '2017-03-09-profile' -Force
Install-Module -Name AzureStack -RequiredVersion 1.2.10
Install-Module -Name 'AzureRm.Bootstrapper'
Install-AzureRmProfile -profile '2017-03-09-profile' -Force
Install-Module -Name AzureStack -RequiredVersion 1.2.11
```

Then make sure the following modules are imported:
Expand Down
2 changes: 1 addition & 1 deletion Connect/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ As a prerequisite, make sure that you installed the correct PowerShell modules a
```powershell
Install-Module -Name 'AzureRm.Bootstrapper'
Install-AzureRmProfile -profile '2017-03-09-profile' -Force
Install-Module -Name AzureStack -RequiredVersion 1.2.10
Install-Module -Name AzureStack -RequiredVersion 1.2.11
```

This tool set allows you to connect to an Azure Stack Development Kit (ASDK) instance from an external personal laptop. You can then access the portal or log into that environment via PowerShell.
Expand Down
1 change: 0 additions & 1 deletion Identity/AzureStack.Identity.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ function New-AzsAdGraphServicePrincipal {
[System.Management.Automation.PSCredential]
$AdminCredential
)

$ApplicationGroupName = $DisplayName
$computerName = $ERCSMachineName
$cloudAdminCredential = $AdminCredential
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ To use these tools, obtain Azure Stack compatible Azure PowerShell module. Unles
For PowerShell, install the following:

```powershell
Install-Module -Name 'AzureRm.Bootstrapper'
Install-AzureRmProfile -profile '2017-03-09-profile' -Force
Install-Module -Name AzureStack -RequiredVersion 1.2.10
Install-Module -Name 'AzureRm.Bootstrapper'
Install-AzureRmProfile -profile '2017-03-09-profile' -Force
Install-Module -Name AzureStack -RequiredVersion 1.2.11
```

Obtain the tools by cloning the git repository.
Expand Down
2 changes: 1 addition & 1 deletion ServiceAdmin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Make sure you have the following module prerequisites installed:
```powershell
Install-Module -Name 'AzureRm.Bootstrapper'
Install-AzureRmProfile -profile '2017-03-09-profile' -Force
Install-Module -Name AzureStack -RequiredVersion 1.2.10
Install-Module -Name AzureStack -RequiredVersion 1.2.11
```

Then make sure the following modules are imported:
Expand Down
2 changes: 1 addition & 1 deletion Usage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ As a prerequisite, make sure that you installed the correct PowerShell modules a
```powershell
Install-Module -Name 'AzureRm.Bootstrapper'
Install-AzureRmProfile -profile '2017-03-09-profile' -Force
Install-Module -Name AzureStack -RequiredVersion 1.2.10
Install-Module -Name AzureStack -RequiredVersion 1.2.11
```

Use this script to extract usage data from the AzureStack Usage API's and export it to a CSV file
Expand Down

0 comments on commit 405fbcd

Please sign in to comment.