Commit Graph

110 Commits (47bcceeaf3027b46af747204ba3a7a6884899caf)

Author SHA1 Message Date
James Cammarata c9da48d5ba Merge branch 'destination_format' of https://github.com/a13m/ansible into a13m-destination_format 9 years ago
Brian Coca e1ee2ed5a5 Merge pull request #13550 from KrzysiekJ/connect_to_region-wrap
Use wrapped connect_to_region everywhere in ec2.py
9 years ago
Brian Coca 8838ed055c Merge pull request #14872 from bcoca/ec2_inv_page_rds
page rds instances
9 years ago
James Cammarata 93542b3666 Merge pull request #14964 from keedya/devel
Fixing bug in the output format when displaying 2 or more hosts
9 years ago
Brian Coca eceabec71f page rds instances
fix #14861
9 years ago
Toshio Kuratomi 959711b56e Merge pull request #14993 from karmab/ovirt_connection_fix
Fixes ovirt inventory to only override credentials when keys exist
9 years ago
karimb 421fb6df8b Fixes ovirt inventory to only override credentials from environment when keys exist 9 years ago
Abhijit Menon-Sen ad0e707f97 Merge pull request #7395 from hkariti/ec2_hostname_variable
Add hostname_variable to ec2 inventory script
9 years ago
James Cammarata 6265d6fd2a Merge pull request #14870 from zyegfryed/patch-1
Fix filtering by project in Cloudstask inventory
9 years ago
Hagai Kariti 8a17da299f Clean up lines with only whitespaces in ec2.py 9 years ago
Hagai Kariti 53756af546 Added hostname_variable to ec2 inventory 9 years ago
Abhijit Menon-Sen f0af07a5f4 Merge pull request #14761 from enbritely/fix-ec2-inventory
Fix AWS EC2 inventory script instance_filters read
9 years ago
Clark Boylan 7d5650219d Fix openstack inventory for multiple servers
Fix openstack inventory for when we have multiple servers with the same
name but different IDs. Instead of giving every server with the same
name the details for the first server returned with that name add the
individual servers as they are returned.

This was a logic bug where in a loop over a list of servers we always
added the first server in that list despite having more than one server.
9 years ago
Andre Keedy d180e0e05f Bug Fix
-Corrected the format in case of  multiple hosts

Remove empty spaces
9 years ago
Monty Taylor 82c150b72f Detect empty cache files in openstack inventory
There are cases where it makes more sense to zero out a cache file as a
form of invalidation instead of removing it. Detect those approrpriately
9 years ago
Sébastien Fievet 83e748e315 Fix filtering by project in Cloudstask inventory 9 years ago
Brian Coca 061d35bbe3 Merge pull request #14297 from keedya/devel
Add rackHd inventory script
9 years ago
Joe 21ba6e9ce8 Do not use name `tag` for intance filter 9 years ago
Joe 5975296770 Fix AWS EC2 external inventory script config read
EC2 inventory scripts reads configuration from an INI file. The `instance_filters` option controls which EC2 instances are retrieved for inventory. Filling this option and running the inventory script with Python 3 crashes with the following error:

```python
Traceback (most recent call last):
  File "./contrib/inventory/ec2.py", line 1328, in <module>
    Ec2Inventory()
  File "./contrib/inventory/ec2.py", line 163, in __init__
    self.read_settings()
  File "./contrib/inventory/ec2.py", line 393, in read_settings
    for instance_filter in config.get('ec2', 'instance_filters', '').split(','):
TypeError: get() takes 3 positional arguments but 4 were given
```

The problem is the last parameter of config.get() call, because `fallback` keyword argument is not specified.

The fix handles epmpty `instance_filers` in case of Python 2&3
9 years ago
Monty Taylor c737bd48bc Deduplicate true duplicate entries in the openstack inventory
There are cases where the host list back from the cloud comes back
duplicated. This causes us to report those with UUIDs, which we do to
support truly different servers with the same name. However, in the case
where duplicate host entries have the same UUID, we can know it's a data
hiccup.
9 years ago
James Cammarata 1b3c669ebe Merge pull request #14428 from shawnsilva/linode-invscript-addips
Linode Dynamic Inventory: Add public IP's as hostvars
9 years ago
Brian Coca 3ddcabee0e Merge pull request #14093 from MatthaeusHarris/proxmox_4_inventory
Proxmox 4 inventory
9 years ago
Shawn Silva f450a4cb69 When the linode inventory is generated the linode label is used as the
inventory host. If the label isn't a FQDN ansible can't connect.
This will set the hostvars for the ansible_ssh_host to the linodes public IP.
9 years ago
Andre keedy e46074c791 Address comments 9 years ago
Andre keedy 083530d8fa Fix erros 9 years ago
Andre keedy 22382726fa Add rackHd inventory script
- Allow ansible to get hosts inventory from rackHD by node id
9 years ago
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
Matt Harris f8e73714f6 If the notes don't contain JSON, add the string to the notes key of _meta 9 years ago
Matt Harris e5493fa631 Added support for proxmox 4.x 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
Krzysztof Jurewicz 73160e65e5 Use wrapped connect_to_region everywhere in ec2.py 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