Commit Graph

80 Commits (45755bc0e52663b6aa0046733cf1e6e17174ce74)

Author SHA1 Message Date
Anthony Robinson b73c7728f4 Update example vpc_desitnation_variable example with working settings 9 years ago
Brian Coca 37eac4592e added back --profile to keep backwards compat
this was broken by #12548
9 years ago
Matthew Jones a1318e1664 Add rax cache age ini documentation 9 years ago
Matthew Jones a106382786 Add a config option for rackspace inventory cache
Adding a config and environment variable option for tuning the cache age
check in the rackspace inventory module
9 years ago
Brian Coca 938c26d952 Merge pull request #13544 from emonty/inventory-config
Add OpenStack Inventory configuration
9 years ago
Monty Taylor 9f61144401 Optionally only use UUIDs for openstack hosts on duplicates
The OpenStack inventory lists hostnames as the UUIDs because hostsnames
are not guarnateed to be unique on OpenStack. However, for the common
case, this is just confusing.

The new behavior is a visible change, so make it an opt-in via config.

Only turn the hostnames to UUIDs if there are duplicate hostnames.
9 years ago
Monty Taylor 1f8e484b70 Fix the refresh flag in openstack inventory
Refresh will update the dogpile cache from shade, but doesn't cause
the ansible side json cache to be invalidated. It's a simple oversight.
9 years ago
Toshio Kuratomi 6472b3daee Merge pull request #13157 from fghaas/lxc
LXC inventory scripts: fix libvirt_lxc, add lxc
9 years ago
Brian Coca 2f139dad3f Merge pull request #12368 from coxley/nsot-inventory
Contrib Inventory: NSoT
9 years ago
Codey Oxley 9dcfbb1130 Removed version argument from argparse
This was breaking standalone execution and isn't needed
9 years ago
Florian Haas 0bc32cbaee Correct connection type returned by libvirt_lxc inventory script
The correct connection type for LXC containers managed via libvirt is
libvirt_lxc, not lxc.
9 years ago
Brian Coca 3952fc7f97 made python 3 compatible 9 years ago
Brian Coca 7ce4903a8b Merge pull request #12139 from amousset/rudder_inventory_plugin
Add Rudder inventory plugin
9 years ago
Abhijit Menon-Sen e6a9b2cae5 Add an expand_csv_tags setting to ec2.ini
If enabled, this will convert tags of the form "a,b,c" to a list and use
the results to create additional inventory groups.

This is based on PR #8676 by nickpeck (but not a straight rebase—both
the code and the nomenclature have been changed here).

Closes #8676
9 years ago
Brian Coca b2a9111b22 reversed the logic on new setting to control - replacment in groups as
it was wrong
fixes #13122
9 years ago
Matthew Jones faeccb4e61 Fix ec2 infinitely nested groups
The ec2 inventory module will incorrectly place parent groups as child
groups of themselves, this fixes that.
9 years ago
Jason O'Donnell 7b0e68917c Fixing typo 9 years ago
Brian Coca 2b8633cec0 Merge pull request #12855 from bcoca/ec2_inv_dash_group
make - replacement in group names optional
9 years ago
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
Brian Coca 07d584c0a7 make - replacement in group names optional 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
Codey Oxley 15915bb3ca NSoT Inventory: python2.7 -> python shebang 9 years ago
Codey Oxley c05970df2c Added NSoT Inventory script to pull from Device resources 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
Alexis Mousset cc95068dc9 Add Rudder inventory plugin 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