Commit graph

178 commits

Author SHA1 Message Date
Brian Coca
349b34109b Merge pull request #10138 from bcoca/vbox_inv
initial draft virtualbox inventory script
2015-02-10 10:07:43 -05:00
Arnoud Vermeer
cc4c70120a Make a COLLINS['SOMETHING'] variable instead of ATTRIBS['0']['SOMETHING'] 2015-02-06 15:06:09 +01:00
Brian Coca
5eafa1e7c3 Merge pull request #9825 from kalefranz/ec2-inventory-tags
Allow ec2 tags to be used to address servers in ec2 dynamic inventory.
2015-02-02 12:58:58 -05:00
Brian Coca
d4a89c8ead moved from callback_output to popen to keep 2.6 compat 2015-01-30 15:09:09 -05:00
Brian Coca
368285b351 initial draft virtualbox inventory script 2015-01-30 10:53:21 -05:00
Erinn Looney-Triggs
d2c49db005 Cleanup and expand FreeIPA inventory script it now accepts CL
parameters.
2015-01-20 15:45:41 -07:00
Chris Meyers
48d4da3a94 add tagless grouping for destinations without any tags 2015-01-16 10:28:34 -05:00
Jason
d39a25d225 Corrected spelling mistake 2015-01-08 17:11:16 +11:00
Michael Scherer
58dbf2446c Fix various inventory scripts to use env python
Fix https://github.com/ansible/ansible/issues/9948
2015-01-07 01:29:19 +01:00
Dan Jenkins
d7b36dd9e7 Add a new inventory group so you can see instances in a particular VPC 2014-12-19 10:39:56 +00:00
Kale Franz
28e69b9017 Allow ec2 tags to be used to address servers in ec2 dynamic inventory. 2014-12-15 22:31:29 -08:00
Michael DeHaan
c9ecc51a5e Merge pull request #9530 from sivel/rax-inventory-access-network
rax.py inventory: improvements
2014-11-17 12:12:13 -08:00
Brian Coca
517ae8b29d Merge pull request #9368 from silvax/handle-return-non-on-join
as I read it, the issue is with a None item in the list, not with an empty list (tests return empty string), still fixes a traceback
2014-11-13 18:40:21 -05:00
Matt Martz
2f03e0c906 Support fallbacks for access network and access ip version 2014-11-10 11:54:33 -06:00
Matt Martz
b9b3c0ded6 Support boot from volume discovery 2014-11-10 11:27:39 -06:00
Matt Martz
1e92aadb5a Add support for reading from a config file 2014-11-10 11:27:39 -06:00
Matt Martz
2bd927fd81 Support RackConnect v3 by allowing a network to be specified for use in determining ansible_ssh_host 2014-11-10 11:27:35 -06:00
Sergei Antipov
8e32dda2e2 Delete import json. Several syntax changes.
Import json called twice. In first it will call an exception, if json
module not installed.
2014-11-10 15:41:44 +06:00
James Cammarata
e8f675003f Merge pull request #9336 from dpkirchner/devel
Added _meta hostvars key to gce.py plugin
2014-10-20 14:39:05 -05:00
Andres Silva
4755bde28d adding for loop on list to to handle the return of none when the list is empty. With the previous method if the list was empty the script died. See http://stackoverflow.com/questions/18852324/typeerror-sequence-item-0-expected-string-nonetype-found 2014-10-17 12:16:35 -04:00
szk.kentaro
36c75d6c5e Add --pretty option for gce inventory plugin 2014-10-15 01:16:49 +09:00
David Kirchner
959520115c Added _meta hostvars key to gce.py plugin per the discussion in issue #9291. 2014-10-14 14:43:28 +00:00
Adam Young
428674cb90 Inventory Plugin to get hostgroups from FreeIPA 2014-10-10 21:26:17 -04:00
Michal Gasek
5b5103e6b4 Add support for filtering EC2 instances in dynamic inventory
This allows filtering out EC2 instances based on various different
filters including tags. As requested in 7480 it supports logical "OR"
instead of "AND" on the provided list of filters.
2014-09-03 00:50:28 +02:00
James Cammarata
1880279bfe Tweaking logical assignment of vm_metadata in abiquo inventory script 2014-09-02 11:00:12 -05:00
Daniel
f8104df457 Corrected VM metadata obtention between Abiquo versions 2014-08-28 16:22:06 +02:00
Michael Peters
8b1d6f5e75 fixing "else" typo 2014-08-12 15:48:14 -04:00
Michael Peters
7194fe1064 need to handle the case where include_pattern and exclude_pattern exist in the config file but contain empty strings 2014-08-12 15:40:15 -04:00
Michael DeHaan
3bead39c75 Merge branch 'spelling' of git://github.com/cgar/ansible into devel
Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
2014-08-08 13:28:45 -04:00
Michael DeHaan
8c4161d4a1 Merge branch 'retf_py' of git://github.com/berendt/ansible into devel
Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	plugins/callbacks/mail.py
2014-08-08 12:17:37 -04:00
Michael DeHaan
2d2178f2c5 Merge pull request #8516 from mpeters/ec2_dyn_inventory_include_exclude_patterns
adding include_pattern and exclude_pattern options to ec2.py
2014-08-08 11:21:38 -04:00
Michael DeHaan
66eddfd491 Merge branch 'nova-compute-enhancements' of git://github.com/emonty/ansible into devel
Conflicts:
	lib/ansible/module_utils/openstack.py
	library/cloud/nova_compute
2014-08-08 11:05:13 -04:00
Michael Peters
7c2cc15c59 adding include_pattern and exclude_pattern options to ec2.py 2014-08-08 09:26:14 -04:00
Monty Taylor
a05804bf8d Update the nova inventory plugin with new ip code
The provisioning module knows more about how nova deals with IP
addresses now. Ensure that the inventory module is similarly as smart
by separating out the logic into the openstack/module_utils.
2014-08-02 22:31:27 -07:00
Luke Sneeringer
f706eba4a5 Envirionment variable support in GCE inventory plugin. 2014-08-01 16:12:57 -05:00
James Cammarata
0ae87cb725 Merge branch 'ec2inv-rdstoggle' of https://github.com/ingmar/ansible into ingmar-ec2inv-rdstoggle
Conflicts:
	plugins/inventory/ec2.py
2014-07-31 13:38:54 -05:00
James Cammarata
5764015876 Merge branch 'ec2_nested_groups' of https://github.com/cchurch/ansible into cchurch-ec2_nested_groups
Conflicts:
	plugins/inventory/ec2.py
2014-07-31 13:07:31 -05:00
Brian Coca
b65536bc56 removed parent, wasn't very useful and caused problems across versions
fixed cache expiration
2014-07-19 15:54:58 -04:00
Brian Coca
900a9f9556 added environment variables as config overrides for vmware inventory
fixed vmware properties, was getting parent's properties
cache now actually works
removed tags, they were not the ones i was looking for
renamed cache defaults fixed ini file to match
2014-07-19 13:11:31 -04:00
Adam Chainz
13a5993a49 Fix indentation in ec2.py 2014-07-14 10:59:17 +01:00
Michael DeHaan
fa2abe3816 Merge pull request #8089 from ssalevan/ssalevan/add-collins-inventory
Adding a Collins inventory script for Ansible
2014-07-10 16:19:41 -04:00
Steve Salevan
96e815d2b9 Don't write to cache if queries fail 2014-07-10 15:58:44 -04:00
Steve Salevan
71c46efe80 Moving to_safe back into class for consistency purposes 2014-07-10 15:58:44 -04:00
Steve Salevan
e621b3a8cc Adding a Collins inventory script for Ansible 2014-07-10 15:58:44 -04:00
Michael DeHaan
caef3a0de2 Merge pull request #8010 from cchurch/ec2_all_instances
Add option to return all EC2/RDS instances regardless of state.
2014-07-09 13:32:32 -04:00
James Cammarata
366b39cfc1 Merge pull request #8007 from msabramo/nova.py_set_defaults
nova.py: Set defaults for OpenStack settings
2014-07-05 00:36:18 -05:00
James Cammarata
67e56853d3 Merge pull request #7996 from msabramo/nova.py_JSON_indented_and_sorted
nova.py: indented and sorted JSON output
2014-07-01 20:10:49 -05:00
Chris Church
7f27c56a79 Add option to return all EC2/RDS instances regardless of state. 2014-07-01 15:50:04 -04:00
Chris Church
4036df11cf Add configurable option to support nested inventory groups. 2014-07-01 15:29:39 -04:00
Marc Abramowitz
50ffa9e0e7 nova.py: Set defaults for OpenStack settings
- auth_system
- region_name

These are config settings that could be left out in many scenarios, but
the current code is requiring them. With this in place, I can get by
with this minimal .ini file:

```ini
[openstack]
version=1.1
auth_url=http://{keystone_host}:5000/v2.0
project_id=web
username={username}
api_key={password}
```
2014-07-01 10:05:57 -07:00