Merge pull request #104755 from TomArcherMsft/terraform-task-378

megvanhuygen · web-flow · commit 3d050915b06d · 2020-02-18T15:54:27.000-08:00
Terraform task 378
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -48550,6 +48550,16 @@
       "source_path": "articles/app-service/containers/tutorial-java-enterprise-postgresql-app.md",
       "redirect_url": "/azure/app-service/containers/configure-language-java",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-machines/linux/terraform-install-configure.md",
+      "redirect_url": "/azure/terraform/terraform-install-configure",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-machines/linux/terraform-create-complete-vm.md",
+      "redirect_url": "/azure/terraform/terraform-create-complete-vm",
+      "redirect_document_id": false
     }
   ]
 }
diff --git a/articles/terraform/index.yml b/articles/terraform/index.yml
@@ -31,7 +31,7 @@ landingContent:
       - linkListType: tutorial
         links:
           - text: Install and configure Terraform
-            url: /azure/virtual-machines/linux/terraform-install-configure?/azure/terraform/toc.json&bc=/azure/bread/toc.json
+            url: terraform-install-configure.md
           - text: Create a Terraform configuration for Azure
             url: terraform-create-configuration.md
           - text: Install the Terraform Visual Studio Code extension
@@ -57,7 +57,7 @@ landingContent:
       - linkListType: quickstart
         links:
           - text: Create a Linux VM
-            url: /azure/virtual-machines/linux/terraform-create-complete-vm?/azure/terraform/toc.json&bc=/azure/bread/toc.json
+            url: terraform-create-complete-vm.md
       - linkListType: tutorial
         links:
           - text: Create a Terraform VM with MSI enabled
diff --git a/articles/terraform/terraform-create-complete-vm.md b/articles/terraform/terraform-create-complete-vm.md
diff --git a/articles/terraform/terraform-create-configuration.md b/articles/terraform/terraform-create-configuration.md
@@ -168,4 +168,4 @@ terraform destroy -auto-approve
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Install and configure Terraform to provision Azure resources](../virtual-machines/linux/terraform-install-configure.md).
+> [Install and configure Terraform to provision Azure resources](terraform-install-configure.md).
diff --git a/articles/terraform/terraform-create-k8s-cluster-with-aks-applicationgateway-ingress.md b/articles/terraform/terraform-create-k8s-cluster-with-aks-applicationgateway-ingress.md
@@ -24,7 +24,7 @@ In this tutorial, you learn how to do the following tasks:
 
 - **Azure subscription**: If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
 
-- **Configure Terraform**: Follow the directions in the article, [Terraform and configure access to Azure](/azure/virtual-machines/linux/terraform-install-configure)
+- **Configure Terraform**: Follow the directions in the article, [Terraform and configure access to Azure](terraform-install-configure.md)
 
 - **Azure resource group**: If you don't have an Azure resource group to use for the demo, [create an Azure resource group](/azure/azure-resource-manager/manage-resource-groups-portal#create-resource-groups). Take note of the resource group name and location as those values are used in the demo.
 
diff --git a/articles/terraform/terraform-create-k8s-cluster-with-tf-and-aks.md b/articles/terraform/terraform-create-k8s-cluster-with-tf-and-aks.md
@@ -20,7 +20,7 @@ In this tutorial, you learn how to do the following tasks:
 
 - **Azure subscription**: If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
 
-- **Configure Terraform**: Follow the directions in the article, [Terraform and configure access to Azure](/azure/virtual-machines/linux/terraform-install-configure)
+- **Configure Terraform**: Follow the directions in the article, [Terraform and configure access to Azure](terraform-install-configure.md)
 
 - **Azure service principal**: Follow the directions in the section of the **Create the service principal** section in the article, [Create an Azure service principal with Azure CLI](/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest). Take note of the values for the appId, displayName, password, and tenant.
 
diff --git a/articles/terraform/terraform-create-vm-cluster-module.md b/articles/terraform/terraform-create-vm-cluster-module.md
@@ -20,9 +20,9 @@ For more information on Terraform, see the [Terraform documentation](https://www
 ## Set up authentication with Azure
 
 > [!TIP]
-> If you [use Terraform environment variables](/azure/virtual-machines/linux/terraform-install-configure) or run this tutorial in the [Azure Cloud Shell](/azure/cloud-shell/overview), skip this step.
+> If you [use Terraform environment variables](terraform-install-configure.md) or run this tutorial in the [Azure Cloud Shell](/azure/cloud-shell/overview), skip this step.
 
- Review [Install Terraform and configure access to Azure](/azure/virtual-machines/linux/terraform-install-configure) to create an Azure service principal. Use this service principal to populate a new file `azureProviderAndCreds.tf` in an empty directory with the following code:
+ Review [Install Terraform and configure access to Azure](terraform-install-configure.md) to create an Azure service principal. Use this service principal to populate a new file `azureProviderAndCreds.tf` in an empty directory with the following code:
 
 ```hcl
 variable subscription_id {}
diff --git a/articles/terraform/terraform-create-vm-cluster-with-infrastructure.md b/articles/terraform/terraform-create-vm-cluster-with-infrastructure.md
@@ -23,11 +23,11 @@ You'll learn how to do the following tasks:
 ## 1. Set up Azure authentication
 
 > [!NOTE]
-> If you [use Terraform environment variables](/azure/virtual-machines/linux/terraform-install-configure), or run this tutorial in the [Azure Cloud Shell](terraform-cloud-shell.md), skip this section.
+> If you [use Terraform environment variables](terraform-install-configure.md), or run this tutorial in the [Azure Cloud Shell](terraform-cloud-shell.md), skip this section.
 
 In this section, you generate an Azure service principal, and two Terraform configuration files containing the credentials from the security principal.
 
-1. [Set up an Azure AD service principal](/azure/virtual-machines/linux/terraform-install-configure#set-up-terraform-access-to-azure) to enable Terraform to provision resources into Azure. While creating the principal, Make note of the values for the subscription ID, tenant, appId, and password.
+1. [Set up an Azure AD service principal](terraform-install-configure.md#set-up-terraform-access-to-azure) to enable Terraform to provision resources into Azure. While creating the principal, Make note of the values for the subscription ID, tenant, appId, and password.
 
 2. Open a command prompt.
 
diff --git a/articles/terraform/terraform-create-vm-scaleset-network-disks-hcl.md b/articles/terraform/terraform-create-vm-scaleset-network-disks-hcl.md
@@ -25,7 +25,7 @@ In this tutorial, you learn how to use [Azure Cloud Shell](/azure/cloud-shell/ov
 
 - **Azure subscription**: If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
 
-- **Install Terraform**: Follow the directions in the article, [Terraform and configure access to Azure](/azure/virtual-machines/linux/terraform-install-configure)
+- **Install Terraform**: Follow the directions in the article, [Terraform and configure access to Azure](terraform-install-configure.md)
 
 - **Create an SSH key pair**: For more information, see [How to create and use an SSH public and private key pair for Linux VMs in Azure](/azure/virtual-machines/linux/mac-create-ssh-keys).
 
diff --git a/articles/terraform/terraform-create-vm-scaleset-network-disks-using-packer-hcl.md b/articles/terraform/terraform-create-vm-scaleset-network-disks-using-packer-hcl.md
@@ -23,7 +23,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
 
 ## Prerequisites
 
-- **Terraform**: [Install Terraform and configure access to Azure](/azure/virtual-machines/linux/terraform-install-configure).
+- **Terraform**: [Install Terraform and configure access to Azure](terraform-install-configure.md).
 - **SSH key pair**: [Create an SSH key pair](/azure/virtual-machines/linux/mac-create-ssh-keys).
 - **Packer**:  [Install Packer](https://www.packer.io/docs/install/index.html).
 
diff --git a/articles/terraform/terraform-hub-spoke-introduction.md b/articles/terraform/terraform-hub-spoke-introduction.md
@@ -26,7 +26,7 @@ for all resources
 
 - **Azure subscription**: If you don't already have an Azure subscription, create a [free Azure account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
 
-- **Install and configure Terraform**: To provision VMs and other infrastructure in Azure, [install and configure Terraform](/azure/virtual-machines/linux/terraform-install-configure)
+- **Install and configure Terraform**: To provision VMs and other infrastructure in Azure, [install and configure Terraform](terraform-install-configure.md)
 
 ## Hub and spoke topology architecture
 
diff --git a/articles/terraform/terraform-install-configure.md b/articles/terraform/terraform-install-configure.md
@@ -30,7 +30,7 @@ To learn more about how to use Terraform with Azure, visit the [Terraform Hub](/
 
 
 
-[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
+[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
 
 Terraform is installed by default in the [Cloud Shell](/azure/terraform/terraform-cloud-shell). If you choose to install Terraform locally, complete the next step, otherwise continue to [Set up Terraform access to Azure](#set-up-terraform-access-to-azure).
 
diff --git a/articles/terraform/terraform-overview.md b/articles/terraform/terraform-overview.md
@@ -35,6 +35,6 @@ Terraform is adept at deploying an infrastructure across multiple cloud provider
 
 Now that you have an overview of Terraform and its benefits, here are suggested next steps:
 
-- Get started by [installing Terraform and configuring it to use Azure](/azure/virtual-machines/linux/terraform-install-configure).
-- [Create an Azure virtual machine using Terraform](/azure/virtual-machines/linux/terraform-create-complete-vm)
+- Get started by [installing Terraform and configuring it to use Azure](terraform-install-configure.md).
+- [Create an Azure virtual machine using Terraform](terraform-create-complete-vm.md)
 - Explore the [Azure Resource Manager module for Terraform](https://www.terraform.io/docs/providers/azurerm/) 
diff --git a/articles/terraform/terraform-vscode-extension.md b/articles/terraform/terraform-vscode-extension.md
@@ -18,7 +18,7 @@ In this article, you learn how to:
 ## Prerequisites
 - **Azure subscription**: If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
 
-- **Terraform**: [Install and configure Terraform](/azure/virtual-machines/linux/terraform-install-configure).
+- **Terraform**: [Install and configure Terraform](terraform-install-configure.md).
 
 - **Visual Studio Code**: Install the version of [Visual Studio Code](https://code.visualstudio.com/download) that is appropriate for your environment.
 
diff --git a/articles/terraform/terraform-vscode-module-generator.md b/articles/terraform/terraform-vscode-module-generator.md
@@ -20,7 +20,7 @@ In this article, you learn how to do the following tasks:
 
 - **Azure subscription**: If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
 - **Visual Studio Code**: [Download Visual Studio Code](https://code.visualstudio.com/download) for your platform.
-- **Terraform**: [Install Terraform](/azure/virtual-machines/linux/terraform-install-configure ) to run the module created by Yeoman.
+- **Terraform**: [Install Terraform](terraform-install-configure.md) to run the module created by Yeoman.
 - **Docker**: [Install Docker](https://www.docker.com/get-started) to run the module created by the Yeoman generator.
 - **Go programming language**: [Install Go](https://golang.org/) as Yeoman-generated test cases are code using the Go language.
 
diff --git a/articles/terraform/toc.yml b/articles/terraform/toc.yml
@@ -8,12 +8,12 @@
   expanded: true
   items:
     - name: Install and configure Terraform
-      href: /azure/virtual-machines/linux/terraform-install-configure
+      href: terraform-install-configure.md
       maintainContext: true
     - name: Create a Terraform configuration
       href: terraform-create-configuration.md
     - name: Create a Linux VM
-      href: /azure/virtual-machines/linux/terraform-create-complete-vm
+      href: terraform-create-complete-vm.md
       maintainContext: true
 - name: Tutorials
   items:
diff --git a/articles/virtual-machines/linux/toc.yml b/articles/virtual-machines/linux/toc.yml
@@ -450,9 +450,9 @@
     - name: Terraform
       items:
       - name: Install and configure
-        href: terraform-install-configure.md
+        href: ../../terraform/terraform-install-configure.md
       - name: Create a complete VM
-        href: terraform-create-complete-vm.md
+        href: ../../terraform/terraform-create-complete-vm.md
     - name: Cloud-init
       items:
       - name: Cloud-init overview
diff --git a/includes/virtual-machines-common-infrastructure-automation.md b/includes/virtual-machines-common-infrastructure-automation.md
@@ -95,8 +95,8 @@ Learn how to:
 
 Learn how to:
 
-- [Install and configure Terraform with Azure](../articles/virtual-machines/linux/terraform-install-configure.md).
-- [Create an Azure infrastructure with Terraform](../articles/virtual-machines/linux/terraform-create-complete-vm.md).
+- [Install and configure Terraform with Azure](../articles/terraform/terraform-install-configure.md).
+- [Create an Azure infrastructure with Terraform](../articles/terraform/terraform-create-complete-vm.md).
 
 
 ## Azure Automation

Original file line number	Diff line number	Diff line change
`@@ -48550,6 +48550,16 @@`
`48550`	`48550`	`"source_path": "articles/app-service/containers/tutorial-java-enterprise-postgresql-app.md",`
`48551`	`48551`	`"redirect_url": "/azure/app-service/containers/configure-language-java",`
`48552`	`48552`	`"redirect_document_id": false`
	`48553`	`+ },`
	`48554`	`+ {`
	`48555`	`+ "source_path": "articles/virtual-machines/linux/terraform-install-configure.md",`
	`48556`	`+ "redirect_url": "/azure/terraform/terraform-install-configure",`
	`48557`	`+ "redirect_document_id": false`
	`48558`	`+ },`
	`48559`	`+ {`
	`48560`	`+ "source_path": "articles/virtual-machines/linux/terraform-create-complete-vm.md",`
	`48561`	`+ "redirect_url": "/azure/terraform/terraform-create-complete-vm",`
	`48562`	`+ "redirect_document_id": false`
`48553`	`48563`	`}`
`48554`	`48564`	`]`
`48555`	`48565`	`}`