Merge pull request #105254 from TomArcherMsft/chef-task-379

Chef - Task 379

Author: ttorble

.openpublishing.redirection.json

@@ -48865,6 +48865,11 @@
       "source_path": "articles/media-services/previous/media-services-develop-video-players.md",
       "redirect_url": "/azure/media-services",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-machines/windows/chef-automation.md",
+      "redirect_url": "/azure/chef/chef-automation",
+      "redirect_document_id": true
     }
   ]
 }

articles/virtual-machines/windows/chef-automation.md renamed to articles/chef/chef-automation.md

@@ -2,7 +2,7 @@
 title: Install the Chef client from the Azure portal
 description: Learn how to deploy and configure your Chef client from the Azure portal
 keywords: azure, chef, devops, client, install, portal
-ms.date: 05/15/2018
+ms.date: 02/22/2020
 ms.topic: article
 ---
 
@@ -74,29 +74,30 @@ In this section, you'll first use the Azure portal to create a Linux machine. Du
 1. On the **Install extension** tab, specify the following values, and then select **OK**.
 
     - **Chef Server URL** - Enter the Chef Server URL that includes the organization name, for example, *https://api.chef.io/organization/mycompany*.
-    - **Chef Node Name** - Enter the Chef Node name. This can be any value.
-    - **Run List** - Enter the Chef run list that is added to the machine. This can be left blank.
-    - **Validation Client Name** - Enter the Chef Validation Client Name. for example, *tarcher-validator*.
+    - **Chef Node name** - Enter the Chef Node name.
+    - **Run list** - Enter the Chef run list that is added to the machine. This value can be left blank.
+    - **Validation client name** - Enter the Chef Validation Client Name. for example, `tarcher-validator`.
     - **Validation Key** - Select a file containing the validation key used when bootstrapping your machines.
-    - **Client Configuration File** - Select a configuration file for chef-client. This can be left blank.
-    - **Chef Client version** - Enter the version of the chef client to install. This can be left blank. A blank value installs the latest version.
+    - **Client configuration file** - Select a configuration file for chef-client. This value can be left blank.
+    - **Chef Client version** - Enter the version of the chef client to install. This value can be left blank, which installs the latest version.
     - **SSL Verification Mode** - Select either **None** or **Peer**. *None* was selected for the demo.
-    - **Chef Environment** - Enter the Chef environment this node should be a member of. This can be left blank.
-    - **Encrypted Databag Secret** - Select a file containing the secret for the Encrypted Databag this machine should have access to. This can be left blank.
-    - **Chef Server SSL Certificate** - Select the SSL Certificate assigned to your Chef Server. This can be left blank.
+    - **Chef Environment** - Enter the Chef environment this node should be a member of. This value can be left blank.
+    - **Encrypted data bag secret** - Select a file containing the secret for the encrypted data bag this machine needs to access. This value can be left blank.
+    - **Chef Server SSL certificate** - Select the SSL certificate assigned to your Chef Server. This value can be left blank.
 
       ![Installing the Chef Server on a Linux virtual machine](./media/chef-extension-portal/install-extension.png)
 
-1. When returning to the **Extensions** tab, select **OK**.
+1. When the **Extensions** tab displays, select **OK**.
 
-1. When returning to the **Settings** tab, select **OK**.
+1. When the **Settings** tab displays, select **OK**.
 
-1. When returning to the **Create** tab (this represents a summary of the options you selected and entered), verify the information as well as the **Terms of use**, and select **Create**.
+1. When the **Create** tab displays, you see a summary of the options you selected and entered. Verify the information as well as the **Terms of use**, and select **Create**.
 
 When the process of creating and deploying the virtual machine with the Chef Extension is complete, a notification indicates the success or failure of the operation. In addition, the resource page for the new virtual machine automatically opens in the Azure portal once it's been created.
 
 ![Installing the Chef Server on a Linux virtual machine](./media/chef-extension-portal/resource-created.png)
 
 ## Next steps
 
-- [Create a Windows virtual machine on Azure using Chef](/azure/virtual-machines/windows/chef-automation)
+> [!div class="nextstepaction"] 
+> [Create a Windows virtual machine on Azure using Chef](chef-automation.md)

articles/chef/chef-extension-portal.md

@@ -2,7 +2,7 @@
 title: Using Chef with Azure
 description: Introduction to using Chef to configure and test your Azure infrastructure
 keywords:  azure, chef, devops, virtual machines, overview, automate
-ms.date: 05/15/2018
+ms.date: 02/22/2020
 ms.topic: article
 ---
 
@@ -12,7 +12,7 @@ ms.topic: article
 This article describes the benefits of using Chef to manage Azure infrastructure.
 
 ## Chef Extension on Azure
-Provision a virtual machine with Chef Client running as a background service with the [Chef Extension](https://docs.microsoft.com/azure/chef/chef-extension-portal) on the Azure Portal. Once provisioned, these virtual machines are ready to be managed by a Chef server.
+Provision a virtual machine with Chef Client running as a background service with the [Chef Extension](https://docs.microsoft.com/azure/chef/chef-extension-portal) on the [Azure portal](https://go.microsoft.com/fwlink/p/?LinkID=525040). Once provisioned, these virtual machines are ready to be managed by a Chef server.
 
 ## Chef Cloud Shell
 Use Chef Workstation directly in Azure Cloud Shell! Run all of your Chef utilities and InSpec right from Cloud Shell. You can utilize the Chef commands from:
@@ -22,7 +22,6 @@ Use Chef Workstation directly in Azure Cloud Shell! Run all of your Chef utiliti
 * [inspec](https://www.inspec.io/docs/reference/cli/)
 * [knife](https://docs.chef.io/knife.html)
 * [cookstyle](https://docs.chef.io/cookstyle.html)
-* [foodcritic](https://docs.chef.io/foodcritic.html)
 * [chef-run](https://www.chef.sh/docs/chef-workstation/getting-started/)
 
 Combine our command utilities with the other tools available in Cloud Shell, such as `git`, `az-cli`, and `terraform`, and write your infrastructure and compliance automation from the browser.
@@ -35,4 +34,4 @@ Supported by Chef, the [Chef Automate Azure Marketplace solution](https://azurem
 
 ## Next steps
 
-* [Create a Windows virtual machine on Azure using Chef](/azure/virtual-machines/windows/chef-automation)
+* [Create a Windows virtual machine on Azure using Chef](chef-automation.md)

articles/chef/chef-overview.md

@@ -50,4 +50,4 @@ landingContent:
       - linkListType: tutorial
         links:
           - text: Create a Windows VM
-            url: /azure/virtual-machines/windows/chef-automation?/azure/chef/toc.json&bc=/azure/bread/toc.json
+            url: chef-automation.md