From 86dc571d5407ca79656010669fba193229bcae92 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Fri, 22 Apr 2016 23:35:53 -0400 Subject: [PATCH] Fixing inventory script ambiguity. --- docsite/rst/guide_azure.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docsite/rst/guide_azure.rst b/docsite/rst/guide_azure.rst index 62dcd27bd10..c5c11a88301 100644 --- a/docsite/rst/guide_azure.rst +++ b/docsite/rst/guide_azure.rst @@ -7,7 +7,7 @@ and orchestrate infrastructure on the Microsoft Azure Cloud. Requirements ------------ -Using the Azure modules requires having `Azure Python SDK `_ +Using the Azure Resource Manager modules requires having `Azure Python SDK `_ installed on the host running Ansible. You will need to have >= v2.0.0RC2 installed. The simplest way to install the SDK is via pip: @@ -19,7 +19,7 @@ SDK is via pip: Authenticating with Azure ------------------------- -Using the Azure modules requires authenticating with the Azure API. You can choose from two authentication strategies: +Using the Azure Resource Manager modules requires authenticating with the Azure API. You can choose from two authentication strategies: * Active Directory Username/Password * Service Principal Credentials @@ -225,14 +225,14 @@ Dynamic Inventory Script If you are not familiar with Ansible's dynamic inventory scripts, check out `Intro to Dynamic Inventory `_. -The azure inventory script is called azure_rm.py. It authenticates with the Azure API exactly the same as the +The Azure Resource Manager inventory script is called azure_rm.py. It authenticates with the Azure API exactly the same as the Azure modules, which means you will either define the same environment variables described above in `Using Environment Variables`_, create a $HOME/.azure/credentials file (also described above in `Storing in a File`_), or pass command line parameters. To see available command line options execute the following: .. code-block:: bash - $ ./ansible/contrib/inventory/azure.py --help + $ ./ansible/contrib/inventory/azure_rm.py --help As with all dynamic inventory scripts, the script can be executed directly, passed as a parameter to the ansible command, or passed directly to ansible-playbook using the -i option. No matter how it is executed the script produces JSON representing