Updating instructions in README to reflect disconnected scenarios

Author: knithinc

CanaryValidator/README.md

@@ -18,6 +18,7 @@ Set-Location -Path ".\AzureStack-Tools-master\CanaryValidator" -PassThru
 # Install-Module -Name 'AzureRm.Bootstrapper'
 # Install-AzureRmProfile -profile '2017-03-09-profile' -Force
 # Install-Module -Name AzureStack -RequiredVersion 1.2.11
+# $TenantID = To retrieve the TenantID if not available already, you can use Get-AzureStackStampInformation cmdlet Using the privileged endpoint in Azure Stack. https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-privileged-endpoint
 $TenantAdminCreds =  New-Object System.Management.Automation.PSCredential "[email protected]", (ConvertTo-SecureString "<Tenant Admin password>" -AsPlainText -Force)
 $ServiceAdminCreds =  New-Object System.Management.Automation.PSCredential "[email protected]", (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
@@ -30,30 +31,27 @@ $ServiceAdminCreds =  New-Object System.Management.Automation.PSCredential "serv
 # Install-Module -Name 'AzureRm.Bootstrapper'
 # Install-AzureRmProfile -profile '2017-03-09-profile' -Force
 # Install-Module -Name AzureStack -RequiredVersion 1.2.11
+# $TenantID = To retrieve the TenantID if not available already, you can use Get-AzureStackStampInformation cmdlet Using the privileged endpoint in Azure Stack. https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-privileged-endpoint
 $TenantAdminCreds =  New-Object System.Management.Automation.PSCredential "[email protected]", (ConvertTo-SecureString "<Tenant Admin password>" -AsPlainText -Force)
 $ServiceAdminCreds =  New-Object System.Management.Automation.PSCredential "[email protected]", (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>"
 ```
+## To execute Canary as Tenant Administrator (In ADFS disconnected scenario)
+Install Azure PowerShell - To install Azure PowerShell in a disconnected or a partially connected senario, follow the instructions @ https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-powershell-install?view=azurestackps-1.2.9&toc=%2fpowershell%2fmodule%2ftoc.json%3fview%3dazurestackps-1.2.9&view=azurestackps-1.2.9#install-powershell-in-a-disconnected-or-in-a-partially-connected-scenario
+```powershell
+# TenantID = To retrieve the TenantID if not available already, you can use Get-AzureStackStampInformation cmdlet Using the privileged endpoint in Azure Stack. https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-privileged-endpoint
 
-## NOTE: 
-To retrieve the TenantID if not available already, you can use the PEP Get-AzureStackStampInformation available on the emergency console. Instructions on connecting to the PEP are available @ https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-privileged-endpoint
-
-TenantID is the AADTenantID value returned from the PEP Get-AzureStackStampInformation
+# If there is no tenant user available, you can create one and use it as shown below
 
-## NOTE: 
-When running Canary against ADFS environment (disconnected), please make sure to pass in the tenantAdminObjectId parameter
-## NOTE: 
-If there is no tenant user is available, you can create one and use it as shown below.
-```powershell
-$tenantAdminUserName = "CanaryTenantAdmin"
-$tenantAdminPassword = "PasswordOfYourChoice"
+$tenantAdminUserName = "TenantAdminUser"
+$tenantAdminPassword = "<Tenant Admin password>"
 $tenantAdminAccount  = New-ADUser -Name $tenantAdminUserName -UserPrincipalName "$tenantAdminUserName@$env:USERDNSDOMAIN" -AccountPassword $tenantAdminPassword -ChangePasswordAtLogin $false -Enabled $true -PasswordNeverExpires $true -PassThru
 $tenantAdminUpn      = $tenantAdminAccount.UserPrincipalName
 $tenantAdminObjectId = $tenantAdminAccount.SID.Value
 $TenantAdminCreds    = New-Object System.Management.Automation.PSCredential $tenantAdminUpn, (ConvertTo-SecureString $tenantAdminPassword -AsPlainText -Force)
+$ServiceAdminCreds   =  New-Object System.Management.Automation.PSCredential "[email protected]", (ConvertTo-SecureString "<Service Admin password>" -AsPlainText -Force)
+.\Canary.Tests.ps1  -TenantID "<TenantID from Azure Active Directory>" -TenantAdminObjectID $tenantAdminObjectId -AdminArmEndpoint "<Administrative ARM endpoint>" -ServiceAdminCredentials $ServiceAdminCreds -TenantArmEndpoint "<Tenant ARM endpoint>" -TenantAdminCredentials $TenantAdminCreds
 ```
-## NOTE: 
-To install Azure PowerShell in a disconnected or a partially connected senario, follow the instructions @ https://docs.microsoft.com/en-us/azure/azure-stack/azure-stack-powershell-install?view=azurestackps-1.2.9&toc=%2fpowershell%2fmodule%2ftoc.json%3fview%3dazurestackps-1.2.9&view=azurestackps-1.2.9#install-powershell-in-a-disconnected-or-in-a-partially-connected-scenario
 
 ## NOTE: 
 While running Canary make sure to pass the usernames in the format: [email protected]