archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename azure inventory script. Fix bug preventing AD user login via environment vars.

Browse Source
pull/15528/head
chouseknecht 8 years ago
parent 7a4e4c2b02
commit af5e4abf66
No known key found for this signature in database
GPG Key ID: 78F1698C5705A81B
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

4
contrib/inventory/azure_rm_inventory.ini → contrib/inventory/azure_rm.ini
Unescape Escape View File

@ -1,5 +1,5 @@
# #
# Configuration file for azure_rm_invetory.py # Configuration file for azure_rm.py
# #
[azure] [azure]
# Control which resource groups are included. By default all resources groups are included. # Control which resource groups are included. By default all resources groups are included.
@ -15,5 +15,5 @@ include_powerstate=yes
# Control grouping with the following boolean flags. Valid values: yes, no, true, false, True, False, 0, 1. # Control grouping with the following boolean flags. Valid values: yes, no, true, false, True, False, 0, 1.
group_by_resource_group=yes group_by_resource_group=yes
group_by_location=yes group_by_location=yes
group_by_security_group=no group_by_security_group=yes
group_by_tag=yes group_by_tag=yes

10
contrib/inventory/azure_rm_inventory.py → contrib/inventory/azure_rm.py
Unescape Escape View File

@ -115,7 +115,7 @@ When run in --list mode, instances are grouped by the following categories:
- tag key - tag key
- tag key_value - tag key_value
Control groups using azure_rm_inventory.ini or set environment variables: Control groups using azure_rm.ini or set environment variables:
AZURE_GROUP_BY_RESOURCE_GROUP=yes AZURE_GROUP_BY_RESOURCE_GROUP=yes
AZURE_GROUP_BY_LOCATION=yes AZURE_GROUP_BY_LOCATION=yes
@ -137,11 +137,11 @@ AZURE_TAGS=key1:value1,key2:value2
If you don't need the powerstate, you can improve performance by turning off powerstate fetching: If you don't need the powerstate, you can improve performance by turning off powerstate fetching:
AZURE_INCLUDE_POWERSTATE=no AZURE_INCLUDE_POWERSTATE=no
azure_rm_inventory.ini azure_rm.ini
---------------------- ----------------------
As mentioned above you can control execution using environment variables or an .ini file. A sample As mentioned above you can control execution using environment variables or an .ini file. A sample
azure_rm_inventory.ini is included. The name of the .ini file is the basename of the inventory script (in this case azure_rm.ini is included. The name of the .ini file is the basename of the inventory script (in this case
'azure_rm_inventory') with a .ini extension. This provides you with the flexibility of copying and customizing this 'azure_rm') with a .ini extension. This provides you with the flexibility of copying and customizing this
script and having matching .ini files. Go forth and customize your Azure inventory! script and having matching .ini files. Go forth and customize your Azure inventory!
Powerstate: Powerstate:
@ -310,7 +310,7 @@ class AzureRM(object):
credentials = self._get_profile(env_credentials['profile']) credentials = self._get_profile(env_credentials['profile'])
return credentials return credentials
if env_credentials['client_id'] is not None: if env_credentials['client_id'] is not None or env_credentials['ad_user'] is not None:
return env_credentials return env_credentials
return None return None

22
docsite/rst/guide_azure.rst
Unescape Escape View File

@ -225,14 +225,14 @@ Dynamic Inventory Script
If you are not familiar with Ansible's dynamic inventory scripts, check out `Intro to Dynamic Inventory <http://docs.ansible.com/ansible/intro_dynamic_inventory.html>`_. If you are not familiar with Ansible's dynamic inventory scripts, check out `Intro to Dynamic Inventory <http://docs.ansible.com/ansible/intro_dynamic_inventory.html>`_.
The azure inventory script is called azure_rm_inventory.py. It authenticates with the Azure API exactly the same as the The azure 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`_, 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 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: line options execute the following:
.. code-block:: bash .. code-block:: bash
$ ./ansible/contrib/inventory/azure_rm_inventory.py --help $ ./ansible/contrib/inventory/azure.py --help
As with all dynamic inventory scripts, the script can be executed directly, passed as a parameter to the ansible command, 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 or passed directly to ansible-playbook using the -i option. No matter how it is executed the script produces JSON representing
@ -297,11 +297,11 @@ By default hosts are grouped by:
* tag key_value * tag key_value
You can control host groupings and host selection by either defining environment variables or creating an You can control host groupings and host selection by either defining environment variables or creating an
azure_rm_inventory.ini file in your current working directory. azure_rm.ini file in your current working directory.
NOTE: An .ini file will take precedence over environment variables. NOTE: An .ini file will take precedence over environment variables.
NOTE: The name of the .ini file is the basename of the inventory script (i.e. 'azure_rm_inventory') with a '.ini' NOTE: The name of the .ini file is the basename of the inventory script (i.e. 'azure_rm') with a '.ini'
extension. This allows you to copy, rename and customize the inventory script and have matching .ini files all in extension. This allows you to copy, rename and customize the inventory script and have matching .ini files all in
the same directory. the same directory.
@ -328,11 +328,10 @@ If you don't need the powerstate, you can improve performance by turning off pow
* AZURE_INCLUDE_POWERSTATE=no * AZURE_INCLUDE_POWERSTATE=no
A sample azure_rm_inventory.ini file is included along with the inventory script in contrib/inventory. An .ini A sample azure_rm.ini file is included along with the inventory script in contrib/inventory. An .ini
file will contain the following: file will contain the following:
.. code-block:: ini .. code-block:: ini
[azure] [azure]
# Control which resource groups are included. By default all resources groups are included. # Control which resource groups are included. By default all resources groups are included.
# Set resource_groups to a comma separated list of resource groups names. # Set resource_groups to a comma separated list of resource groups names.
@ -342,12 +341,13 @@ file will contain the following:
#tags= #tags=
# Include powerstate. If you don't need powerstate information, turning it off improves runtime performance. # Include powerstate. If you don't need powerstate information, turning it off improves runtime performance.
# Valid values: yes, no, true, false, True, False, 0, 1.
include_powerstate=yes include_powerstate=yes
# Control grouping with the following boolean flags. Valid values: yes, no, true, false, True, False, 0, 1. # Control grouping with the following boolean flags. Valid values: yes, no, true, false, True, False, 0, 1.
group_by_resource_group=yes group_by_resource_group=yes
group_by_location=yes group_by_location=yes
group_by_security_group=no group_by_security_group=yes
group_by_tag=yes group_by_tag=yes
@ -359,13 +359,13 @@ Here are some examples using the inventory script:
.. code-block:: bash .. code-block:: bash
# Execute /bin/uname on all instances in the Testing resource group # Execute /bin/uname on all instances in the Testing resource group
$ ansible -i azure_rm_inventory.py Testing -m shell -a "/bin/uname -a" $ ansible -i azure_rm.py Testing -m shell -a "/bin/uname -a"
# Use the inventory script to print instance specific information # Use the inventory script to print instance specific information
$ ./ansible/contrib/inventory/azure_rm_inventory.py --host my_instance_host_name --resource-groups=Testing --pretty $ ./ansible/contrib/inventory/azure_rm.py --host my_instance_host_name --resource-groups=Testing --pretty
# Use the inventory script with ansible-playbook # Use the inventory script with ansible-playbook
$ ansible-playbook -i ./ansible/contrib/inventory/azure_rm_inventory.py test_playbook.yml $ ansible-playbook -i ./ansible/contrib/inventory/azure_rm.py test_playbook.yml
Here is a simple playbook to exercise the Azure inventory script: Here is a simple playbook to exercise the Azure inventory script:
@ -382,4 +382,4 @@ You can execute the playbook with something like:
.. code-block:: bash .. code-block:: bash
$ ansible-playbook -i ./ansible/contrib/inventory/azure_rm_inventory.py test_azure_inventory.yml $ ansible-playbook -i ./ansible/contrib/inventory/azure_rm.py test_azure_inventory.yml

2
lib/ansible/modules/core

@ -1 +1 @@
Subproject commit 2256ae0793cf46a06949254599be1ebccc7746c0 Subproject commit 67de0675c39e6e505e02b145ee1456c284c45344
Write Preview
Loading…
Cancel
Save