Skip to content

Commit a743d7f

Browse files
committed
Merge branch 'vnext' of https://github.com/Azure/AzureStack-Tools into vnext
2 parents 4ce53c9 + 3c0d2ea commit a743d7f

File tree

14 files changed

+292
-115
lines changed

14 files changed

+292
-115
lines changed

CanaryValidator/Canary.Tests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ while ($runCount -le $NumberOfIterations)
222222
Get-AzSStorageSubsystem -Location $ResourceLocation
223223
}
224224

225-
Invoke-Usecase -Name 'GetAzureStackStorageShare' -Description "List all storage file shares" -UsecaseBlock `
225+
Invoke-Usecase -Name 'GetAzureStackInfrastructureShare' -Description "List all storage file shares" -UsecaseBlock `
226226
{
227-
Get-AzsStorageShare -Location $ResourceLocation
227+
Get-AzsInfrastructureShare -Location $ResourceLocation
228228
}
229229

230230
Invoke-Usecase -Name 'GetAzureStackScaleUnit' -Description "List Azure Stack scale units in specified Region" -UsecaseBlock `
@@ -1120,7 +1120,7 @@ while ($runCount -le $NumberOfIterations)
11201120
{
11211121
if (Get-AzureRmVMImage -Location $ResourceLocation -PublisherName $linuxImagePublisher -Offer $linuxImageOffer -Sku $LinuxOSSku -ErrorAction SilentlyContinue)
11221122
{
1123-
Remove-AzsVMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -Location $ResourceLocation
1123+
Remove-AzsVMImage -publisher $linuxImagePublisher -offer $linuxImageOffer -sku $LinuxOSSku -version $linuxImageVersion -Location $ResourceLocation -Force
11241124
}
11251125
}
11261126
Invoke-Usecase -Name 'DeleteSubscriptionResourceGroup' -Description "Delete the resource group that contains subscription resources" -UsecaseBlock `

CanaryValidator/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Set-Location -Path ".\AzureStack-Tools-master\CanaryValidator" -PassThru
1717
```powershell
1818
# Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
1919
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
20-
# Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
20+
# Install-Module -Name AzureStack -RequiredVersion 1.2.10 -Scope CurrentUser
2121
$TenantAdminCreds = New-Object System.Management.Automation.PSCredential "<Tenant Admin username>", (ConvertTo-SecureString "<Tenant Admin password>" -AsPlainText -Force)
2222
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
2323
.\Canary.Tests.ps1 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>" -TenantAdminCredentials $TenantAdminCreds
@@ -29,7 +29,7 @@ $ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Ser
2929
# Download the WS2016 ISO image from: https://www.microsoft.com/en-us/evalcenter/evaluate-windows-server-2016, and place it on your local machine
3030
# Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
3131
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
32-
# Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
32+
# Install-Module -Name AzureStack -RequiredVersion 1.2.10 -Scope CurrentUser
3333
$TenantAdminCreds = New-Object System.Management.Automation.PSCredential "<Tenant Admin username>", (ConvertTo-SecureString "<Tenant Admin password>" -AsPlainText -Force)
3434
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
3535
.\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>"
@@ -40,7 +40,7 @@ $ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Ser
4040
```powershell
4141
# Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
4242
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
43-
# Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
43+
# Install-Module -Name AzureStack -RequiredVersion 1.2.10 -Scope CurrentUser
4444
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
4545
.\Canary.Tests.ps1 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds
4646
```
@@ -50,7 +50,7 @@ $ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Ser
5050
```powershell
5151
# Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
5252
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
53-
# Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
53+
# Install-Module -Name AzureStack -RequiredVersion 1.2.10 -Scope CurrentUser
5454
.\Canary.Tests.ps1 -ListAvailable
5555
5656
Sample output:
@@ -136,7 +136,7 @@ List of scenarios in Canary:
136136
```powershell
137137
# Install-Module -Name 'AzureRm.Bootstrapper' -Scope CurrentUser
138138
# Install-AzureRmProfile -profile '2017-03-09-profile' -Force -Scope CurrentUser
139-
# Install-Module -Name AzureStack -RequiredVersion 1.2.9 -Scope CurrentUser
139+
# Install-Module -Name AzureStack -RequiredVersion 1.2.10 -Scope CurrentUser
140140
# 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.
141141
$ServiceAdminCreds = New-Object System.Management.Automation.PSCredential "<Service Admin username>", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
142142
.\Canary.Tests.ps1 -TenantID "<TenantID from Azure Active Directory>" -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -ExclusionList "ListFabricResourceProviderInfo","ListUpdateResourceProviderInfo"

ComputeAdmin/ComputeAdmin.gif

418 KB
Loading

ComputeAdmin/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Azure Stack Compute Administration
2+
![Adding an image in an ADFS environment](/ComputeAdmin/ComputeAdmin.gif)
3+
24

35
Instructions below are relative to the .\ComputeAdmin folder of the [AzureStack-Tools repo](..).
46

Connect/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Import-Module .\AzureStack.Connect.psm1
1818

1919
## VPN to Azure Stack Development Kit
2020

21-
![VPN to Azure Stack Development Kit](https://github.com/Azure/AzureStack-Tools/raw/renamestaging/Connect/VPNConnection.gif)
21+
![VPN to Azure Stack Development Kit](/Connect/VPNConnection.gif)
2222

2323
The [Connect to Azure Stack](https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-connect-azure-stack) document describes ways to connect to your Azure Stack Development Kit environment.
2424

@@ -54,7 +54,7 @@ Connect-AzsVpn -Password $Password
5454
```
5555

5656
## Configure Azure Stack PowerShell Environment
57-
![Adding Azure Stack Environment](https://github.com/Azure/AzureStack-Tools/raw/renamestaging/Connect/EnvironmentAdd.gif)
57+
![Adding Azure Stack Environment](/Connect/EnvironmentAdd.gif)
5858

5959

6060
One method of deploying templates and interacting with your Azure Stack Development Kit is to access it via PowerShell.

Deployment/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ If the installation completed succesfully, but you ran into an issue that requir
8888
The installer script allows you to easily initiate a reboot to the SafeOS to start a redeployment of your Azure Stack Development Kit. Start the installer script and select Reboot. You will be presented with the current boot options. Select the entry for the SafeOS and select Reboot. This creates a onetime override in the boot order. The SafeOS boot entry will be select automatically. The next reboot the boot configuration will resume its normal order and the host will boot into the cloudbuilder.vhdx again.
8989

9090
### Note
91-
The Azure Stack Development Kit installer script is based on PowerShell and the Windows Presentation Foundation. It is published in this public repository so you can make improvements to it by submitting a pull request.
91+
The Azure Stack Development Kit installer script is based on PowerShell and the Windows Presentation Foundation. It is published in this public repository so you can make improvements to it by submitting a pull request.

0 commit comments

Comments
 (0)