Skip to content

Commit e2d62f5

Browse files
authored
Merge branch 'master' into repo_sync_working_branch
2 parents a8b66ce + 5267ad4 commit e2d62f5

File tree

144 files changed

+2530
-2586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+2530
-2586
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25616,6 +25616,11 @@
2561625616
"redirect_url": "/azure/storage/queues/storage-queues-introduction",
2561725617
"redirect_document_id": false
2561825618
},
25619+
{
25620+
"source_path": "articles/storage/data-lake-storage/index.md",
25621+
"redirect_url": "/azure/storage/data-lake-storage/introduction",
25622+
"redirect_document_id": false
25623+
},
2561925624
{
2562025625
"source_path": "articles/dev-spaces/index.md",
2562125626
"redirect_url": "/azure/dev-spaces/azure-dev-spaces",
@@ -27330,6 +27335,11 @@
2733027335
"redirect_url": "/azure/virtual-machines/linux/ansible-create-vm",
2733127336
"redirect_document_id": true
2733227337
},
27338+
{
27339+
"source_path": "articles/networking/networking-virtual-datacenter.md",
27340+
"redirect_url": "/azure/architecture/vdc/networking-virtual-datacenter",
27341+
"redirect_document_id": true
27342+
},
2733327343
{
2733427344
"source_path": "articles/security-center/security-center-disk-encryption.md",
2733527345
"redirect_url": "/azure/security/azure-security-disk-encryption-overview",

articles/active-directory/devices/hybrid-azuread-join-managed-domains.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ This tutorial assumes that you are familiar with:
5050

5151

5252
To configure the scenario in this article, you need the [latest version of Azure AD Connect](https://www.microsoft.com/download/details.aspx?id=47594) (1.1.819.0 or higher) to be installed.
53-
53+
54+
Verify that Azure AD Connect has synchronized the computer objects of the devices you want to be hybrid Azure AD joined to Azure AD. If the computer objects belong to specific organizational units (OU), then these OUs need to be configured for synchronization in Azure AD connect as well.
5455

5556
Beginning with version 1.1.819.0, Azure AD Connect provides you with a wizard to configure hybrid Azure AD join. The wizard enables you to significantly simplify the configuration process. The related wizard configures the service connection points (SCP) for device registration.
5657

articles/ansible/ansible-create-configure-vmss.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,18 @@ description: Learn how to use Ansible to create and configure a virtual machine
44
ms.service: ansible
55
keywords: ansible, azure, devops, bash, playbook, virtual machine, virtual machine scale set, vmss
66
author: tomarcher
7-
manager: jpconnock
8-
editor: na
9-
ms.topic: article
10-
ms.tgt_pltfrm: vm-linux
11-
ms.date: 07/11/2018
7+
manager: jeconnoc
128
ms.author: tarcher
9+
ms.topic: tutorial
10+
ms.date: 08/24/2018
1311
---
1412

1513
# Create virtual machine scale sets in Azure using Ansible
1614
Ansible allows you to automate the deployment and configuration of resources in your environment. You can use Ansible to manage your virtual machine scale set (VMSS) in Azure, the same as you would manage any other Azure resource. This article shows you how to use Ansible to create and scale out a virtual machine scale set.
1715

1816
## Prerequisites
1917
- **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.
20-
- **Configure Ansible** - [Create Azure credentials and configure Ansible](../virtual-machines/linux/ansible-install-configure.md#create-azure-credentials)
21-
- **Ansible and the Azure Python SDK modules**
22-
- [CentOS 7.4](../virtual-machines/linux/ansible-install-configure.md#centos-74)
23-
- [Ubuntu 16.04 LTS](../virtual-machines/linux/ansible-install-configure.md#ubuntu-1604-lts)
24-
- [SLES 12 SP2](../virtual-machines/linux/ansible-install-configure.md#sles-12-sp2)
18+
- [!INCLUDE [ansible-prereqs-for-cloudshell-use-or-vm-creation1.md](../../includes/ansible-prereqs-for-cloudshell-use-or-vm-creation1.md)] [!INCLUDE [ansible-prereqs-for-cloudshell-use-or-vm-creation2.md](../../includes/ansible-prereqs-for-cloudshell-use-or-vm-creation2.md)]
2519

2620
> [!Note]
2721
> Ansible 2.6 is required to run the following the sample playbooks in this tutorial.
@@ -31,7 +25,7 @@ This section presents a sample Ansible playbook that defines the following resou
3125
- **Resource group** into which all of your resources will be deployed
3226
- **Virtual network** in the 10.0.0.0/16 address space
3327
- **Subnet** within the virtual network
34-
- **Public IP address** that wllows you to access resources across the Internet
28+
- **Public IP address** that allows you to access resources across the Internet
3529
- **Network security group** that controls the flow of network traffic in and out of your virtual machine scale set
3630
- **Load balancer** that distributes traffic across a set of defined VMs using load balancer rules
3731
- **Virtual machine scale set** that uses all the created resources
@@ -181,7 +175,7 @@ The created virtual machine scale set has two instances. If you navigate to the
181175
az vmss show -n myVMSS -g myResourceGroup --query '{"capacity":sku.capacity}'
182176
```
183177

184-
The output should be similar to the following:
178+
You see results similar to the following output:
185179

186180
```bash
187181
{
@@ -266,7 +260,7 @@ If navigate to the virtual machine scale set you configured in the Azure portal,
266260
az vmss show -n myVMSS -g myResourceGroup --query '{"capacity":sku.capacity}'
267261
```
268262

269-
The results of running the command in Cloud Shell shows that three instances now exist.
263+
The result of running the command in Cloud Shell shows that three instances now exist.
270264

271265
```bash
272266
{

articles/ansible/ansible-deploy-app-vmss.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,18 @@ description: Learn how to use Ansible to configure a virtual machine scale set a
44
ms.service: ansible
55
keywords: ansible, azure, devops, bash, playbook, virtual machine, virtual machine scale set, vmss
66
author: tomarcher
7-
manager: jpconnock
8-
editor: na
9-
ms.topic: article
10-
ms.tgt_pltfrm: vm-linux
11-
ms.date: 07/11/2018
7+
manager: jeconnoc
128
ms.author: tarcher
9+
ms.topic: tutorial
10+
ms.date: 08/24/2018
1311
---
1412

1513
# Deploy applications to virtual machine scale sets in Azure using Ansible
1614
Ansible allows you to automate the deployment and configuration of resources in your environment. You can use Ansible to deploy your applications to Azure. This article shows you how to deploy a Java application to an Azure virtual machine scale set (VMSS).
1715

1816
## Prerequisites
1917
- **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.
20-
- **Configure Ansible** - [Create Azure credentials and configure Ansible](../virtual-machines/linux/ansible-install-configure.md#create-azure-credentials)
21-
- **Ansible and the Azure Python SDK modules**
22-
- [CentOS 7.4](../virtual-machines/linux/ansible-install-configure.md#centos-74)
23-
- [Ubuntu 16.04 LTS](../virtual-machines/linux/ansible-install-configure.md#ubuntu-1604-lts)
24-
- [SLES 12 SP2](../virtual-machines/linux/ansible-install-configure.md#sles-12-sp2)
18+
- [!INCLUDE [ansible-prereqs-for-cloudshell-use-or-vm-creation1.md](../../includes/ansible-prereqs-for-cloudshell-use-or-vm-creation1.md)] [!INCLUDE [ansible-prereqs-for-cloudshell-use-or-vm-creation2.md](../../includes/ansible-prereqs-for-cloudshell-use-or-vm-creation2.md)]
2519
- **Virtual machine scale set** - If you don't already have a virtual machine scale set, you can [create a virtual machine scale set with Ansible](ansible-create-configure-vmss.md).
2620
- **git** - [git](https://git-scm.com) is used to download a Java sample used in this tutorial.
2721
- **Java SE Development Kit (JDK)** - The JDK is used to build the sample Java project.
@@ -154,7 +148,7 @@ To use the ssh connection type with passwords, you must install the sshpass prog
154148
- For Ubunto 16.04, run the command `apt-get install sshpass`.
155149
- For CentOS 7.4, run the command `yum install sshpass`.
156150

157-
You may see an error like **Using an SSH password instead of a key is not possible because Host Key checking is enabled and sshpass does not support this. Add this host's fingerprint to your known_hosts file to manage this host.** If you see this error, you can disable host key checking by adding the following line to either the `/etc/ansible/ansible.cfg` file or the `~/.ansible.cfg` file:
151+
You may see an error like **Using an SSH password instead of a key is not possible because Host Key checking is enabled and sshpass does not support this. Add this host's fingerprint to your known_hosts file to manage this host.** If you see this error, you can disable host key checking by adding the following line to either the `/etc/ansible/ansible.cfg` file or the `~/.ansible.cfg` file:
158152
```bash
159153
[defaults]
160154
host_key_checking = False

articles/app-service-mobile/app-service-mobile-net-upgrading-from-mobile-services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ When you have the new client version ready, try it out against your upgraded ser
264264
[Create a Mobile App]: app-service-mobile-xamarin-ios-get-started.md
265265
[Add push notifications to your mobile app]: app-service-mobile-xamarin-ios-get-started-push.md
266266
[Add authentication to your mobile app]: app-service-mobile-xamarin-ios-get-started-users.md
267-
[Azure Scheduler]: /en-us/documentation/services/scheduler/
267+
[Azure Scheduler]: /azure/scheduler/
268268
[Web Job]: https://github.com/Azure/azure-webjobs-sdk/wiki
269269
[How to use the .NET server SDK]: app-service-mobile-dotnet-backend-how-to-use-server-sdk.md
270270
[Migrate from Mobile Services to an App Service Mobile App]: app-service-mobile-migrating-from-mobile-services.md

articles/automation/automation-connections.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ You are able to use the script to create the connection asset because when you c
7979

8080
## Using a connection in a runbook or DSC configuration
8181

82-
You retrieve a connection in a runbook or DSC configuration with the **Get-AutomationConnection** cmdlet. You cannot use the [Get-AzureRmAutomationConnection](https://docs.microsoft.com/powershell/resourcemanager/azurerm.automation/v1.0.12/Get-AzureRmAutomationConnection?redirectedfrom=msdn) activity. This activity retrieves the values of the different fields in the connection and returns them as a [hash table](http://go.microsoft.com/fwlink/?LinkID=324844) which can then be used with the appropriate commands in the runbook or DSC configuration.
82+
You retrieve a connection in a runbook or DSC configuration with the **Get-AutomationConnection** cmdlet. You cannot use the [Get-AzureRmAutomationConnection](/powershell/module/azurerm.automation/get-azurermautomationconnection) activity. This activity retrieves the values of the different fields in the connection and returns them as a [hash table](http://go.microsoft.com/fwlink/?LinkID=324844) which can then be used with the appropriate commands in the runbook or DSC configuration.
8383

8484
### Textual runbook sample
8585

articles/automation/automation-deploy-template-runbook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ In this topic, we create a PowerShell runbook that uses an Resource Manager temp
2828

2929
To complete this tutorial, you need the following:
3030

31-
* Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or <a href="/pricing/free-account/" target="_blank">[sign up for a free account](https://azure.microsoft.com/free/).
31+
* Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or [sign up for a free account](https://azure.microsoft.com/free/).
3232
* [Automation account](automation-sec-configure-azure-runas-account.md) to hold the runbook and authenticate to Azure resources. This account must have permission to start and stop the virtual machine.
3333
* [Azure Storage account](../storage/common/storage-create-storage-account.md) in which to store the Resource Manager template
3434
* Azure Powershell installed on a local machine. See [Install and configure Azure Powershell](https://docs.microsoft.com/powershell/azure/install-azurerm-ps?view=azurermps-4.1.0) for information about how to get Azure PowerShell.

articles/automation/automation-pass-json-string.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The PowerShell runbook starts an Azure VM, getting the parameters for the VM fro
2727
## Prerequisites
2828
To complete this tutorial, you need the following:
2929

30-
* Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or <a href="/pricing/free-account/" target="_blank">[sign up for a free account](https://azure.microsoft.com/free/).
30+
* Azure subscription. If you don't have one yet, you can [activate your MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details/) or [sign up for a free account](https://azure.microsoft.com/free/).
3131
* [Automation account](automation-sec-configure-azure-runas-account.md) to hold the runbook and authenticate to Azure resources. This account must have permission to start and stop the virtual machine.
3232
* An Azure virtual machine. We stop and start this machine so it should not be a production VM.
3333
* Azure Powershell installed on a local machine. See [Install and configure Azure Powershell](https://docs.microsoft.com/powershell/azure/install-azurerm-ps?view=azurermps-4.1.0) for information about how to get Azure PowerShell.

articles/azure-functions/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
href: functions-continuous-deployment.md
165165
- name: Zip deployment
166166
href: deployment-zip-push.md
167-
- name: Run from zip file
167+
- name: Run from package
168168
href: run-functions-from-deployment-package.md
169169
- name: Automate resource deployment
170170
href: functions-infrastructure-as-code.md

0 commit comments

Comments
 (0)