Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into intlbregionmove

asudbring · asudbring · commit 54b29bc77c13 · 2019-09-17T19:15:10.000-07:00
diff --git a/articles/terraform/index.yml b/articles/terraform/index.yml
@@ -1,63 +1,91 @@
-### YamlMime:YamlDocument
-documentType: LandingData
+### YamlMime:Landing
+
 title: Terraform on Azure documentation
+summary: Learn how to use Terraform to reliably provision virtual machines and other infrastructure on Azure.
+
 metadata:
   title: Terraform on Azure documentation - Tutorials, samples, reference, and resources
   description: Learn how to use Terraform to reliably provision virtual machines and other infrastructure on Azure.
-  services: terraform
-  ms.service: azure
-  keywords: terraform, azure, devops, tutorials, samples, reference
-  author: tomarchermsft
-  manager: jeconnoc
-  ms.author: tarcher
+  services: azure
+  ms.service: terraform
   ms.topic: landing-page
-  ms.date: 08/31/2018
-abstract:
-  description: Use Terraform to reliably version and create infrastructure on Azure. Learn how to create resources, use Azure Terraform modules, and maintain your infrastructure with code using our Quickstarts and tutorials.
-sections:
-- title: Quickstarts
-  items:
-  - type: paragraph
-    text: Configure Terraform and use it to create a Linux VM in Azure.
-  - type: list
-    style: icon48
-    items: 
-    - image: 
-        src: https://docs.microsoft.com/azure/media/index/azure_dev-9.svg
-      text: Install and configure Terraform
-      href: https://docs.microsoft.com/azure/virtual-machines/linux/terraform-install-configure
-    - image: 
-        src: https://docs.microsoft.com/azure/media/index/VirtualMachine.svg
-      text: Create a Linux VM
-      href: https://docs.microsoft.com/azure/virtual-machines/linux/terraform-create-complete-vm
-- title: Step-by-Step Tutorials
-  items:
-  - type: paragraph
-    text: Learn how to create Azure compute and networking infrastructure from code with Terraform.
-  - type: list
-    style: unordered
-    items:
-    - html: <a href="/azure/terraform/terraform-create-k8s-cluster-with-tf-and-aks">Create a Kubernetes cluster with AKS</a>.
-    - html: <a href="/azure/terraform/terraform-create-k8s-cluster-with-aks-applicationgateway-ingress">Create a Kubernetes cluster with Application Gateway as ingress controller with AKS</a>.
-    - html: <a href="/azure/terraform/terraform-vm-msi">Create a Terraform VM with MSI authentication enabled using an Azure Marketplace image</a>.
-    - html: <a href="/azure/terraform/terraform-create-vm-cluster-module">Create a load balanced VM cluster using Azure Terraform modules</a>.
-    - html: <a href="/azure/terraform/terraform-create-vm-cluster-with-infrastructure">Create a load balanced VM cluster in the Azure Cloud Shell</a>.
-    - html: <a href="/azure/terraform/terraform-create-vm-scaleset-network-disks-hcl">Configure a VM scale set with networking and storage</a>
-    - html: <a href="/azure/terraform/terraform-create-vm-scaleset-network-disks-using-packer-hcl">Provision VM scale set from a Packer custom image</a>
-- title: Samples
-  items:
-  - type: paragraph
-    text: Sample configuration templates for common deployment tasks.
-  - type: list
-    style: unordered
-    className: spaced noBullet
-    items:
-    - html: <a href="https://github.com/terraform-providers/terraform-provider-azurerm/tree/master/examples">GitHub</a>
-- title: Reference
-  items:
-  - type: list
-    style: cards
-    className: cardsD
-    items:
-    - title: Azure Terraform modules
-      html: <p><a href="https://registry.terraform.io/modules/Azure/database/azurerm">Azure RM for Database</a></p><p><a href="https://registry.terraform.io/modules/Azure/loadbalancer">Azure RM for Load Balancer</a></p><p><a href="https://registry.terraform.io/modules/Azure/computegroup">Azure RM Compute Group</a></p><p><a href="https://registry.terraform.io/modules/Azure/network">Azure RM Network</a></p><p><a href="https://registry.terraform.io/modules/Azure/compute">Azure RM Compute</a></p>
+  author: TomArcherMsft
+  ms.author: tarcher
+  ms.date: 09/12/2019
+
+landingContent:
+  # Card
+  - title: About Terraform on Azure
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: About Terraform on Azure
+            url: terraform-overview.md
+      - linkListType: architecture
+        links:
+          - text: Terraform Azure Provider
+            url: https://aka.ms/terraform
+
+  # Card
+  - title: Install and configure Terraform
+    linkLists:
+      - 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
+          - text: Create a Terraform configuration for Azure
+            url: terrafom-quickstart.md
+          - text: Install the Terraform Visual Studio Code extension
+            url: terraform-vscode-extension.md
+          - text: Create a Terraform base template using Yeoman
+            url: terraform-vscode-module-generator.md
+          - text: Test Terraform modules using Terratest
+            url: terratest-in-terraform-modules.md
+            
+  # Card
+  - title: Manage AKS
+    linkLists:
+      - linkListType: tutorial
+        links:
+          - text: Create a Kubernetes cluster with AKS
+            url: terraform-create-k8s-cluster-with-tf-and-aks.md
+          - text: Create a Kubernetes cluster with Application Gateway
+            url: terraform-create-k8s-cluster-with-aks-applicationgateway-ingress.md
+
+  # Card
+  - title: Manage infrastructure
+    linkLists:
+      - 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
+      - linkListType: tutorial
+        links:
+          - text: Create a Terraform VM with MSI enabled
+            url: terraform-vm-msi.md
+          - text: Create a VM cluster with Terraform modules
+            url: terraform-create-vm-cluster-module.md
+          - text: Create a VM cluster with Terraform and HCL
+            url: terraform-create-vm-cluster-with-infrastructure.md
+          - text: Provision VM scale set with infrastructure
+            url: terraform-create-vm-scaleset-network-disks-hcl.md
+          - text: Provision VM scale set from a Packer custom image
+            url: terraform-create-vm-scaleset-network-disks-using-packer-hcl.md
+
+  # Card
+  - title: Manage networks
+    linkLists:
+      - linkListType: tutorial
+        links:
+          - text: 1. Create hub and spoke topology
+            url: terraform-hub-spoke-introduction.md
+          - text: 2. Create on-premises virtual network
+            url: terraform-hub-spoke-on-prem.md
+          - text: 3. Create hub virtual network
+            url: terraform-hub-spoke-hub-network.md
+          - text: 4. Create hub virtual network appliance
+            url: terraform-hub-spoke-hub-nva.md
+          - text: 5. Create spoke network
+            url: terraform-hub-spoke-spoke-network.md
+          - text: 6. Validate network topology connectivity 
+            url: terraform-hub-spoke-validation.md
diff --git a/articles/terraform/terraform-cloud-shell.md b/articles/terraform/terraform-cloud-shell.md
@@ -1,5 +1,5 @@
 ---
-title: Use Terraform with Azure Cloud Shell
+title: Configure Azure Cloud Shell for Terraform
 description: Use Terraform with Azure Cloud Shell to simplify authentication and template configuration.
 services: terraform
 ms.service: azure
diff --git a/articles/terraform/toc.yml b/articles/terraform/toc.yml
@@ -7,11 +7,11 @@
 - name: Quickstarts
   expanded: true
   items:
-    - name: Create a multi-service application
-      href: terrafom-quickstart.md
     - name: Install and configure Terraform
       href: /azure/virtual-machines/linux/terraform-install-configure
       maintainContext: true
+    - name: Create a multi-service application
+      href: terrafom-quickstart.md
     - name: Create a Linux VM
       href: /azure/virtual-machines/linux/terraform-create-complete-vm
       maintainContext: true
@@ -67,10 +67,6 @@
   items:
     - name: Configuration templates
       href: https://github.com/terraform-providers/terraform-provider-azurerm/tree/master/examples
-- name: Concepts
-  items:
-    - name: Azure Cloud Shell integration
-      href: terraform-cloud-shell.md
 - name: How-to guides
   items:
     - name: Store state in Azure Storage
@@ -79,7 +75,7 @@
   items:
     - name: Azure module registry
       href: https://registry.terraform.io/modules/Azure
-    - name: Terraform reference
+    - name: Terraform Azure Provider
       href: https://aka.ms/terraform
 - name: Resources
   items:
diff --git a/articles/virtual-machines/linux/terraform-install-configure.md b/articles/virtual-machines/linux/terraform-install-configure.md
@@ -1,5 +1,5 @@
 ---
-title: Install and configure Terraform for use with Azure | Microsoft Docs
+title: Install and configure Terraform to provision Azure resources | Microsoft Docs
 description: Learn how to install and configure Terraform to create Azure resources
 services: virtual-machines-linux
 documentationcenter: virtual-machines
@@ -14,11 +14,11 @@ ms.service: virtual-machines-linux
 ms.topic: article
 ms.tgt_pltfrm: vm-linux
 ms.workload: infrastructure
-ms.date: 06/19/2018
-ms.author: gwallace
+ms.date: 09/17/2019
+ms.author: tarcher
 ---
 
-# Install and configure Terraform to provision VMs and other infrastructure into Azure
+# Install and configure Terraform to provision Azure resources
  
 Terraform provides an easy way to define, preview, and deploy cloud infrastructure by using a [simple templating language](https://www.terraform.io/docs/configuration/syntax.html). This article describes the necessary steps to use Terraform to provision resources in Azure.
 
