Commit Graph

67 Commits (63ea614b4c5222d292d97f5827fb1b161f681daa)

Author SHA1 Message Date
Brian Coca be82e4c614 Merge pull request #10362 from emonty/fix-kwarg
Clean up OpenStack inventory to use a cleaner interface
9 years ago
Brian Coca aac20aa076 removed unused exception vars 9 years ago
Monty Taylor cac00add8d Update to final shade inventory interface
shade has an inventory interface that is cleaner. We should use it.
9 years ago
Brian Coca 2c24fbbd6a Merge pull request #12618 from AdThrive/devel
Added an option to use the private network IP address for DigitalOcean dynamic inventory
9 years ago
Yuri Vysotskiy a2422bfb60 Added additional ini file search path into contrib/inventory/zabbix.py 9 years ago
jamarzka bdd3ae9d61 Set the default use_private_network setting to False 9 years ago
jamarzka eddfc649de Added an option to use the private network IP address
This option defaults to disabled and can be set from the digital_ocean.ini file.
9 years ago
Will Thames b0133d9c8f Move connection handling failure to connect_to_aws
Make use of better error handling mechanism
9 years ago
Jameel Al-Aziz 57754b5a71 Fix security_token typo in ec2 inventory 9 years ago
Jameel Al-Aziz e7890e66f3 Combine ansible/ansible#5987 and ansible/ansible#8582
Fixes merge conflicts and standardizes option naming
9 years ago
Jeff '2 bits' Bachtel 8c11ea5666 Add an ec2 inventory option "boto_profile" that allows
the use of boto profiles for separating credentials as
specified in

http://boto.readthedocs.org/en/latest/boto_config_tut.html
9 years ago
willthames 9c967dd054 Allow ec2 inventory to use a boto profile
This allows the EC2 inventory plugin to be used with
the same configuration against different EC2 accounts

Profile can be passed using --profile variable or using
EC2_PROFILE environment variable e.g.

```
EC2_PROFILE=prod ansible-playbook -i ec2.py playbook.yml
```

Added documentation on profiles to EC2 dynamic inventory doc

Only tries to use profiles if --profile argument is given
or EC2_PROFILE is set to maintain compatibility will boto < 2.24.

Works around a minor bug in boto where if you try and use
a security token with a profile it fails (boto/boto#2100)
9 years ago
Ferry Boender c6c3ce6616 Output proper JSON from vbox dynamic inventory contrib script 9 years ago
Toshio Kuratomi 3db8070aa3 Fix urlopen usage to use open_url instead
Add a travis test for urlopen usage
9 years ago
Toshio Kuratomi c1039de70c Compatibility with six-1.3.0 9 years ago
Marius Gedminas 0eb0b56722 Replace type() checks with isinstance()
Fixes the bug I introduced in my previous commit (six.string_types is
(basestring,) on Python 2).  Thanks @abadger for noticing!
9 years ago
Marius Gedminas 37be9539ff Python 3: use six.text_type instead of unicode
Replace 'unicode' with six.text_type, everywhere but in module_utils.
9 years ago
Marius Gedminas 823677b490 Replace .iteritems() with six.iteritems()
Replace .iteritems() with six.iteritems() everywhere except in
module_utils (because there's no 'six' on the remote host).  And except
in lib/ansible/galaxy/data/metadata_template.j2, because I'm not sure
six is available there.
9 years ago
James Cammarata ae865b9480 Merge pull request #12150 from opoplawski/cobbler
Fix setting dns_name in cobbler inventory
9 years ago
Jonathan Lestrelin d56165b7f9 Add Nagios NDO inventory plugin 9 years ago
Orion Poplawski 3b17efe5bc Fix setting dns_name in cobbler inventory 9 years ago
Marius Gedminas 3f9879aedb Use print() as function under contrib/
This fixes the remaining Python 3 syntax errors, so re-enable compileall
for contrib/ again.
9 years ago
Marius Gedminas 9ae66a7f5c Use 'except ... as' syntax in contrib/ and test/ too 9 years ago
Marius Gedminas df1b41d3d3 Avoid types.NoneType
types.NoneType was removed in Python 3.

None is a singleton in Python, so 'x is None' is equivalent to
'isinstance(x, NoneType)'.
9 years ago
Brian Coca 86100da3a0 Merge pull request #11446 from cchurch/windows_azure_from_tower
Updates to Windows Azure inventory from Tower.
9 years ago
Brian Coca 1d402ae390 set script as executable 9 years ago
Tom Berger 8a61303c88 Move the cache file to ~/.ansible/tmp.
A future branch might make it configurable.
9 years ago
Tom Berger 07a4076d12 Name cache file by relevant regions - they might change between calls.
Also, use old school string interpolation so that the plugin is compatible with
Python < 2.7.
9 years ago
Tom Berger cd1125aac2 Save the cache in a file specific to the RackSpace account in use. 9 years ago
Tom Berger 804489f734 Cache the results for the RackSpace dynamic inventory. 9 years ago
Chris Church 4ccdb81bf5 Updates to Windows Azure inventory script from Tower. Includes changes from https://github.com/ansible/ansible/pull/8403. 9 years ago
Chris Church da56312322 Openstack inventory updates from Tower. Includes changes from https://github.com/ansible/ansible/pull/10491 and https://github.com/ansible/ansible/pull/10776. 9 years ago
James Cammarata e2a8a68c85 Cleaning up some debugging/commented code from #11709 9 years ago
dmccue 54bab2c47e fixed issues with output format and order key 9 years ago
dmccue ba6b89a5b1 adjusted output behavior 9 years ago
dmccue 0ab970da98 support for _meta retrieval 9 years ago
Brian Coca ebfd99e307 Merge pull request #8870 from photoninger/spacewalk_organizations
Add support for multiple organizations in spacewalk.
9 years ago
Marcos Garcia 7bd1749f48 Bug #11830, keep working even if we use private_networking 9 years ago
Bernhard Lichtinger aa1e00e8e7 Forgot to use commit -a to submit all changes... 9 years ago
Bernhard Lichtinger 38ff797d57 Added support for ini-file.
Added _meta dictionary with hostvars in --list json output.
9 years ago
Bernhard Lichtinger 13198c199e Add support for multiple organizations in spacewalk. 9 years ago
Tomas Karasek bb6a327c1b fix ssh_config inventory plugin to work with paramiko 1.7.2 till 1.15.2 9 years ago
Brian Coca b8336f222d Merge pull request #11560 from oscarhealth/devel
ability to specify any combination of EC2 instance states to return
9 years ago
Brian Coca d75b4cd190 Merge pull request #11006 from alexlo03/ec2_inventory_clear_errors
explain source of EC2 inventory error
9 years ago
Brian Coca d276b69b2a put proxmox inventory in correct dir and added to changelog 9 years ago
Brian Coca 0c21196633 moved openvz inventory script to new home 9 years ago
Andrew Hamilton 7f45c9edf7 Have ec2.py expand tilde and vars when looking up the EC2_INI_PATH env variable 9 years ago
Igor Khomyakov 8113409d34 Refactored.
Paramiko module is used to parse ssh_config.
Added multi-vm support
Added "_meta" element https://docs.ansible.com/ansible/developing_inventory.html#tuning-the-external-inventory-script
9 years ago
Mathieu Lecarme 1873e8ed08 GCE tag prefix for creating ansible group. 9 years ago
Jens Carl db4f6b8878 Fix to handle user directory correctly (e.g. ~/.ansible/tmp). 9 years ago