Merge pull request #111626 from rayne-wiselman/rayneapril15

updating articles for Azure Gov

Author: megvanhuygen

articles/migrate/common-questions-appliance.md

@@ -2,7 +2,7 @@
 title: Azure Migrate appliance FAQ
 description: Get answers to common questions about the Azure Migrate appliance.
 ms.topic: conceptual
-ms.date: 03/09/2020
+ms.date: 04/15/2020
 ---
 
 # Azure Migrate appliance: Common questions
@@ -26,6 +26,15 @@ Here's more information about the Azure Migrate appliance:
 
 [Learn more](migrate-appliance.md) about the appliance.
 
+## How can I deploy the appliance?
+
+The appliance can be deployed as follows:
+
+- Using a template for VMware VMs and Hyper-V VMs (OVA template for VMware or VHD for Hyper-V).
+- If you don't want to use a template, or you're in Azure Government, you can deploy the appliance for VMware or Hyper-V using a PowerShell script.
+- For physical servers, you always deploy the appliance using a script.
+
+
 ## How does the appliance connect to Azure?
 
 The appliance can connect over the internet or by using Azure ExpressRoute with public/Microsoft peering.
@@ -40,11 +49,8 @@ When you use the downloaded template to create the appliance VM, you can add com
 
 ## What network connectivity is required?
 
-See the following articles for information about network connectivity requirements for the Azure Migrate appliance:
 
-- **VMware assessment**: [URL access](migrate-appliance.md#url-access) and [port access](migrate-support-matrix-vmware.md#port-access)
-- **VMware agentless migration**: [URL access](migrate-appliance.md#url-access) and [port access](migrate-support-matrix-vmware-migration.md#agentless-ports)
-- **Hyper-V assessment**: [URL access](migrate-appliance.md#url-access) and [port access](migrate-support-matrix-hyper-v.md#port-access)
+The appliance needs access to Azure URLs. [Review](migrate-appliance.md#url-access) the URL list.
 
 ## What data does the appliance collect?
 

articles/migrate/common-questions-discovery-assessment.md

@@ -2,7 +2,7 @@
 title: Questions about discovery, assessment, and dependency analysis in Azure Migrate
 description: Get answers to common questions about discovery, assessment, and dependency analysis in Azure Migrate.
 ms.topic: conceptual
-ms.date: 02/17/2020
+ms.date: 04/15/2020
 
 ---
 
@@ -15,10 +15,17 @@ This article answers common questions about discovery, assessment, and dependenc
 - Questions about [server migration](common-questions-server-migration.md)
 - Get questions answered in the [Azure Migrate forum](https://aka.ms/AzureMigrateForum)
 
+
+## What geographies are supported for discovery and assessment with Azure Migrate?
+
+Review the supported geographies for [public](migrate-support-matrix.md#supported-geographies-public-cloud) and [government clouds](migrate-support-matrix.md#supported-geographies-azure-government).
+
+
 ## How many VMs can I discover with an appliance?
 
 You can discover up to 10,000 VMware VMs, up to 5,000 Hyper-V VMs, and up to 250 physical servers by using a single appliance. If you have more machines, read about [scaling a Hyper-V assessment](scale-hyper-v-assessment.md), [scaling a VMware assessment](scale-vmware-assessment.md), or [scaling a physical server assessment](scale-physical-assessment.md).
 
+
 ## The size of my VM changed. Can I run an assessment again?
 
 The Azure Migrate appliance continuously collects information about the on-premises environment.  An assessment is a point-in-time snapshot of on-premises VMs. If you change the settings on a VM that you want to assess, use the recalculate option to update the assessment with the latest changes.

articles/migrate/common-questions-server-migration.md

@@ -14,6 +14,10 @@ This article answers common questions about the Azure Migrate: Server Migration
 - Questions about [discovery, assessment, and dependency visualization](common-questions-discovery-assessment.md)
 - Get questions answered in the [Azure Migrate forum](https://aka.ms/AzureMigrateForum)
 
+## What geographies are supported for migration with Azure Migrate?
+
+Review the supported geographies for [public](migrate-support-matrix.md#supported-geographies-public-cloud) and [government clouds](migrate-support-matrix.md#supported-geographies-azure-government).
+
 ## How does agentless VMware replication work?
 
 The agentless replication method for VMware uses VMware snapshots and VMware Changed Block Tracking (CBT).

articles/migrate/concepts-assessment-calculation.md

@@ -13,6 +13,9 @@ This article provides an overview of assessments in the [Azure Migrate:Server As
 
 An assessment with the Server Assessment tool measures the readiness, and estimates the impact, of migrating on-premises servers to Azure.
 
+> [!NOTE]
+> In Azure Government, review the [supported target](migrate-support-matrix.md#supported-geographies-azure-government) assessment locations. Note that VM size recommendations in assessments will use the VM series specifically for Government Cloud regions. [Learn more](https://azure.microsoft.com/global-infrastructure/services/?regions=usgov-non-regional,us-dod-central,us-dod-east,usgov-arizona,usgov-iowa,usgov-texas,usgov-virginia&products=virtual-machines) about VM types.
+
 ## Types of assessments
 
 Assessments you create with Server Assessment are a point-in-time snapshot of data. Server Assessment provides two types of assessments.
@@ -177,7 +180,7 @@ After the machine is marked as ready for Azure, Server Assessment makes sizing r
 If you use performance-basing sizing, Server Assessment making sizing recommendations as follows:
 
 - Server Assessment considers the performance history of the machine to identify the VM size and disk type in Azure.
-- If servers have been imported using a CSV file, the values you specify are used. This method is especially helpful if you've over-allocated the on-premises machine, utilization is actually low, and you want to right-size the VM in Azure to save costs. 
+- If servers have been imported using a CSV file, the values you specify are used. This method is especially helpful if you've over-allocated the on-premises machine, utilization is low, and you want to right-size the VM in Azure to save costs. 
 - If you don't want to use the performance data, reset the sizing criteria to as-is on-premises, as described in the previous section.
 
 #### Calculate storage sizing
@@ -269,4 +272,4 @@ Costs are displayed in the currency specified in the assessment settings.
 
 - Learn about running assessments for [VMware VMs](tutorial-prepare-vmware.md), [Hyper-V VMs](tutorial-prepare-hyper-v.md), and [physical servers](tutorial-prepare-physical.md).
 - Learn about assessing servers [imported with a CSV file](tutorial-assess-import.md).
-- Learn about setting up [dependency visualization](concepts-dependency-visualization.md).
+- Learn about setting up [dependency visualization](concepts-dependency-visualization.md).

articles/migrate/concepts-dependency-visualization.md

@@ -2,7 +2,7 @@
 title: Dependency analysis in Azure Migrate Server Assessment
 description: Describes how to use dependency analysis for assessment using Azure Migrate Server Assessment.
 ms.topic: conceptual
-ms.date: 03/11/2020
+ms.date: 04/15/2020
 ---
 
 # Dependency analysis
@@ -25,7 +25,7 @@ There are two options for deploying dependency analysis
 - **Agentless**: With agentless analysis, you don't need to install agents on machines you want to cross-check. This option is currently in preview, and is only available for VMware VMs.
 
 > [!NOTE]
-> Dependency analysis isn't available in Azure Government.
+> Agent-based dependency analysis isn't available in Azure Government. You can use agentless dependency analysis.
 
 ## Agentless analysis
 

articles/migrate/deploy-appliance-script.md

@@ -2,18 +2,28 @@
 title: Set up an Azure Migrate appliance with a script
 description: Learn how to set up an Azure Migrate appliance with a script
 ms.topic: article
-ms.date: 03/23/2020
+ms.date: 04/16/2020
 ---
 
 
 # Set up an appliance with a script
 
-This article describes how to set up the [Azure Migrate appliance](deploy-appliance.md) using a PowerShell installer script.
+This article describes how to set up the [Azure Migrate appliance](deploy-appliance.md) using a PowerShell installer script, for VMware VMs, and Hyper-V VMs. If you want to set up the appliance for physical servers, [review this article](how-to-set-up-appliance-physical.md).
+
+
+You can deploy the appliance using a couple of methods:
+
+
+- Using a template for VMware VMs (OVA) or Hyper-V VMs (VHD).
+- Using a script. This is the method described in this article. The script provides:
+    - An alternative to setting up the appliance using an OVA template, for assessment and agentless migration of VMware VMs.
+    - An alternative to setting up the appliance using a VHD template, for assessment and migration of Hyper-V VMs.
+    - For assessment of physical servers (or VMs that you want to migrate as physical servers), the script is the only method for setting up the appliance.
+    - A way to deploy the appliance in Azure Government.
+
+
+After creating the appliance, you verify that it can connect to Azure Migrate. You then configure the appliance for the first time, and register it with the Azure Migrate project.
 
-The script provides:
-- An alternative to setting up the appliance using an OVA template, for assessment and agentless migration of VMware VMs.
-- An alternative to setting up the appliance using a VHD template, for assessment and migration of Hyper-V VMs.
-- For assessment of physical servers (or VMs that you want to migrate as physical servers), the script is the only method for setting up the appliance.
 
 ## Prerequisites
 
@@ -23,32 +33,109 @@ The script sets up the Azure Migrate appliance on an existing physical machine o
 - Before you deploy the appliance, review detailed appliance requirements for [VMware VMs](migrate-appliance.md#appliance---vmware), [Hyper-V VMs](migrate-appliance.md#appliance---hyper-v), and [physical servers](migrate-appliance.md#appliance---physical).
 - Don't run the script on an existing Azure Migrate appliance.
 
+## Set up the appliance for VMware
+
+To set up the appliance for VMware you download a zipped file from the Azure portal, and extract the contents. You run the PowerShell script to launch the appliance web app. You set up the appliance and configure it for the first time. Then, you register the appliance with the Azure Migrate project.
+
+### Download the script
+
+1.	In **Migration Goals** > **Servers** > **Azure Migrate: Server Assessment**, click **Discover**.
+2.	In **Discover machines** > **Are your machines virtualized?**, select **Yes, with VMWare vSphere hypervisor**.
+3.	Click **Download**, to download the zipped file. 
+
+
+### Verify file security
+
+Check that the zipped file is secure, before you deploy it.
+
+1. On the machine to which you downloaded the file, open an administrator command window.
+2. Run the following command to generate the hash for the zipped file
+    - ```C:\>CertUtil -HashFile <file_location> [Hashing Algorithm]```
+    - Example usage for public cloud: ```C:\>CertUtil -HashFile C:\Users\administrator\Desktop\AzureMigrateInstaller.zip SHA256```
+    - Example usage for government cloud: ```C:\>CertUtil -HashFile C:\Users\administrator\Desktop\AzureMigrateInstaller-VMWare-USGov.zip```
+
+3. Verify the generated hash values:
+
+    - For the public cloud (for the latest appliance version):
+
+        **Algorithm** | **Hash value**
+          --- | ---
+          MD5 | 1e92ede3e87c03bd148e56a708cdd33f
+          SHA256 | a3fa78edc8ff8aff9ab5ae66be1b64e66de7b9f475b6542beef114b20bfdac3c
+
+    - For Azure government (for the latest appliance version):
+
+        **Algorithm** | **Hash value**
+          --- | ---
+          MD5 | 6316bcc8bc932204295bfe33f4be3949
+          
+
+### Run the script
+
+Here's what the script does:
+
+- Installs agents and a web application.
+- Installs Windows roles, including Windows Activation Service, IIS, and PowerShell ISE.
+- Downloads and installs an IIS rewritable module. [Learn more](https://www.microsoft.com/download/details.aspx?id=7435).
+- Updates a registry key (HKLM), with persistent settings for Azure Migrate.
+- Creates log and configuration files as follows:
+    - **Config Files**: %ProgramData%\Microsoft Azure\Config
+    - **Log Files**: %ProgramData%\Microsoft Azure\Logs
+
+To run the script:
+
+1. Extract the zipped file to a folder on the machine that will host the appliance. Make sure you don't run the script on a machine on an existing Azure Migrate appliance.
+2. Launch PowerShell on the machine, with administrator (elevated) privileges.
+3. Change the PowerShell directory to the folder containing the contents extracted from the downloaded zipped file.
+4. Run the script **AzureMigrateInstaller.ps1**, as follows:
+    - For the public cloud: ``` PS C:\Users\administrator\Desktop\AzureMigrateInstaller> AzureMigrateInstaller.ps1 -scenario VMware ```
+    - For Azure Government: ``` PS C:\Users\Administrators\Desktop\AzureMigrateInstaller-VMWare-USGov>AzureMigrateInstaller.ps1 ```
+   
+5. After the script runs successfully, it launches the appliance web application so that you can set up the appliance. If you encounter any issues, review the script logs at C:\ProgramData\Microsoft Azure\Logs\AzureMigrateScenarioInstaller_<em>Timestamp</em>.log.
 
-## Download the script
+### Verify access
 
-1. Locate the machine/VM that will act as the Azure Migrate appliance.
-2. On the machine, do the following:
+Make sure that the appliance can connect to Azure URLs for [public](migrate-appliance.md#public-cloud-urls) and [government clouds](migrate-appliance.md#government-cloud-urls.
 
-    - To use the appliance with VMware VMs or Hyper-V VMs, [download](https://go.microsoft.com/fwlink/?linkid=2105112) the zipped folder containing the installer script and the MSIs.
-    - To use the appliance with physical servers, download the script from the Azure Migrate portal, as described in this [tutorial](tutorial-assess-physical.md#set-up-the-appliance).
 
-## Verify file security
+## Set up the appliance for Hyper-V
+
+To set up the appliance for Hyper-V you download a zipped file from the Azure portal, and extract the contents. You run the PowerShell script to launch the appliance web app. You set up the appliance and configure it for the first time. Then, you register the appliance with the Azure Migrate project.
+
+### Download the script
+
+1.	In **Migration Goals** > **Servers** > **Azure Migrate: Server Assessment**, click **Discover**.
+2.	In **Discover machines** > **Are your machines virtualized?**, select **Yes, with Hyper-V**.
+3.	Click **Download**, to download the zipped file. 
+
+
+### Verify file security
 
 Check that the zipped file is secure, before you deploy it.
 
 1. On the machine to which you downloaded the file, open an administrator command window.
 2. Run the following command to generate the hash for the zipped file
     - ```C:\>CertUtil -HashFile <file_location> [Hashing Algorithm]```
-    - Example usage: ```C:\>CertUtil -HashFile C:\Users\administrator\Desktop\AzureMigrateInstaller.zip SHA256```
+    - Example usage for public cloud: ```C:\>CertUtil -HashFile C:\Users\administrator\Desktop\AzureMigrateInstaller.zip SHA256```
+    - Example usage for government cloud: ```C:\>CertUtil -HashFile C:\Users\administrator\Desktop\AzureMigrateInstaller-HyperV-USGov.zip MD5```
+
+3. Verify the generated hash values:
 
-3. Verify that the generated hash values match these settings (for the latest appliance version):
+    - For the public cloud (for the latest appliance version):
 
-    **Algorithm** | **Hash value**
-      --- | ---
-      MD5 | 1e92ede3e87c03bd148e56a708cdd33f
-      SHA256 | a3fa78edc8ff8aff9ab5ae66be1b64e66de7b9f475b6542beef114b20bfdac3c
+        **Algorithm** | **Hash value**
+          --- | ---
+          MD5 | 1e92ede3e87c03bd148e56a708cdd33f
+          SHA256 | a3fa78edc8ff8aff9ab5ae66be1b64e66de7b9f475b6542beef114b20bfdac3c
 
-## Run the script
+    - For Azure government (for the latest appliance version):
+
+        **Algorithm** | **Hash value**
+          --- | ---
+          MD5 | 717f8b9185f565006b5aff0215ecadac
+          
+
+### Run the script
 
 Here's what the script does:
 
@@ -62,28 +149,24 @@ Here's what the script does:
 
 To run the script:
 
-1. Extract the zipped file to a folder on the machine that will host the appliance.
+1. Extract the zipped file to a folder on the machine that will host the appliance. Make sure you don't run the script on a machine on an existing Azure Migrate appliance.
 2. Launch PowerShell on the machine, with administrator (elevated) privileges.
 3. Change the PowerShell directory to the folder containing the contents extracted from the downloaded zipped file.
-4. Run the script **AzureMigrateInstaller.ps1** as follows:
-
-    - For VMware: 
-        ```
-        PS C:\Users\administrator\Desktop\AzureMigrateInstaller> AzureMigrateInstaller.ps1 -scenario VMware
-        ```
-    - For Hyper-V:
-        ```
-        PS C:\Users\administrator\Desktop\AzureMigrateInstaller> AzureMigrateInstaller.ps1 -scenario Hyperv
-        ```
-    - For physical servers:
-        ```
-        PS C:\Users\administrator\Desktop\AzureMigrateInstaller> AzureMigrateInstaller.ps1
-        ```      
-5. After the script runs successfully, it launches the appliance web application so that you can set up the appliance. If you encounter any issues, you can view the script logs at C:\ProgramData\Microsoft Azure\Logs\AzureMigrateScenarioInstaller_<em>Timestamp</em>.log.
+4. Run the script **AzureMigrateInstaller.ps1**, as follows:
+    - For the public cloud: ``` PS C:\Users\administrator\Desktop\AzureMigrateInstaller> AzureMigrateInstaller.ps1 -scenario Hyperv ```
+    - For Azure Government: ``` PS C:\Users\Administrators\Desktop\AzureMigrateInstaller-HyperV-USGov>AzureMigrateInstaller.ps1 ```
+   
+5. After the script runs successfully, it launches the appliance web application so that you can set up the appliance. If you encounter any issues, review the script logs at C:\ProgramData\Microsoft Azure\Logs\AzureMigrateScenarioInstaller_<em>Timestamp</em>.log.
+
+### Verify access
+
+Make sure that the appliance can connect to Azure URLs for [public](migrate-appliance.md#public-cloud-urls) and [government clouds](migrate-appliance.md#government-cloud-urls.
+
+
 
 ## Next steps
 
-After you've set up the appliance using the script, follow these instructions:
+To learn more about setting up the appliance with a template, or for physical servers, review these articles:
 
 - Set up the appliance for [VMware](how-to-set-up-appliance-vmware.md#configure-the-appliance).
 - Set up the appliance for [Hyper-V](how-to-set-up-appliance-hyper-v.md#configure-the-appliance).