Commit Graph

148 Commits (63bf2f6d9a7c0942f25ec11a0706e6e573ab092d)

Author SHA1 Message Date
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
10 years ago
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
10 years ago
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
10 years ago
Michael Peters 7c2cc15c59 adding include_pattern and exclude_pattern options to ec2.py 10 years ago
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.
10 years ago
Luke Sneeringer f706eba4a5 Envirionment variable support in GCE inventory plugin. 10 years ago
James Cammarata 0ae87cb725 Merge branch 'ec2inv-rdstoggle' of https://github.com/ingmar/ansible into ingmar-ec2inv-rdstoggle
Conflicts:
	plugins/inventory/ec2.py
10 years ago
James Cammarata 5764015876 Merge branch 'ec2_nested_groups' of https://github.com/cchurch/ansible into cchurch-ec2_nested_groups
Conflicts:
	plugins/inventory/ec2.py
10 years ago
Brian Coca b65536bc56 removed parent, wasn't very useful and caused problems across versions
fixed cache expiration
10 years ago
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
10 years ago
Adam Chainz 13a5993a49 Fix indentation in ec2.py 11 years ago
Michael DeHaan fa2abe3816 Merge pull request #8089 from ssalevan/ssalevan/add-collins-inventory
Adding a Collins inventory script for Ansible
11 years ago
Steve Salevan 96e815d2b9 Don't write to cache if queries fail 11 years ago
Steve Salevan 71c46efe80 Moving to_safe back into class for consistency purposes 11 years ago
Steve Salevan e621b3a8cc Adding a Collins inventory script for Ansible 11 years ago
Michael DeHaan caef3a0de2 Merge pull request #8010 from cchurch/ec2_all_instances
Add option to return all EC2/RDS instances regardless of state.
11 years ago
James Cammarata 366b39cfc1 Merge pull request #8007 from msabramo/nova.py_set_defaults
nova.py: Set defaults for OpenStack settings
11 years ago
James Cammarata 67e56853d3 Merge pull request #7996 from msabramo/nova.py_JSON_indented_and_sorted
nova.py: indented and sorted JSON output
11 years ago
Chris Church 7f27c56a79 Add option to return all EC2/RDS instances regardless of state. 11 years ago
Chris Church 4036df11cf Add configurable option to support nested inventory groups. 11 years ago
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}
```
11 years ago
Marc Abramowitz 26cc0b3780 nova.py: indented and sorted JSON output 11 years ago
Marc Abramowitz 685fae4d9c nova.py: Remove DOCUMENTATION block
@mpdehaan said that nothing uses them at
https://github.com/ansible/ansible/pull/7988#issuecomment-47600006
11 years ago
James Cammarata 12f7c9871e Merge pull request #7555 from icebourg/softlayer_inventory
SoftLayer Inventory script
11 years ago
Martin Joehren 188a13efc0 azure - fix for: temporary redirect, not deleted vhds, missing locations and role types, async api calls 11 years ago
James Cammarata e083168773 Merge branch 'devel' of https://github.com/jwhitbeck/ansible into jwhitbeck-devel 11 years ago
Hector Acosta a080873e7c Show friendlier error message if nova.ini is not found.
Signed-off-by: Hector Acosta <hector.acosta@gmail.com>
11 years ago
Sean Whitbeck bbfb949bee Add windows azure inventory plugin 11 years ago
AJ Bourg a9ba02ff04 Update dependencies. Add some doc notes. 11 years ago
AJ Bourg 27e99f2a84 Update some doc strings 11 years ago
AJ Bourg 5986959597 Remove some development code. EC2 -> SoftLayer 11 years ago
AJ Bourg 79f2dca60a Initial SoftLayer API inventory client. 11 years ago
Paul Durivage b9f7da7b44 Docker client occasionally returns a NoneType, so we have to catch the TypeError 11 years ago
Christian Berendt 6676720ce5 fixed typos found by RETF rules in PY files
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
11 years ago
Lorin Hochstein 27f305ae08 Document how to turn off ec2 cache
Document how to disable cache lookup with the ec2 inventory script
11 years ago
James Cammarata 442c68f7e8 Merge pull request #7025 from angstwad/docker_inv
Add Docker inventory plugin
11 years ago
James Cammarata d5e4b665a5 Merge pull request #7004 from danfaizer/abiquo-inventory-plugin
Added dynamic inventory plugin for Abiquo
11 years ago
Paul Durivage f0bb3aeeea Add Docker inventory plugin 11 years ago
danfaizer 7867335702 Added Abiquo inventory plugin 11 years ago
Joe Fiorini 2a3514b60b Support hosts without private ip without errors
Not all Linode hosts have a private ip. This fixes an actual error that was happening because the generated list of private ips is empty when there isn't one.
11 years ago
Matt Martz 21a2d32ffc Fix empty group in rax.py output 11 years ago
Michael DeHaan df0a4b735a Merge pull request #6603 from sivel/rax-inventory-improvements
rax.py inventory script improvements
11 years ago
Ingmar Hupp cc01f7b7f5 Do not filter out RDS instances by default or in INI file to avoid changing current behaviour. 11 years ago
Ingmar Hupp 456d2627e8 EC2 inventory toggle to exclude/include RDS instances. 11 years ago
Henry Finucane 7626eacc7a Make ssh_config paramiko 1.12/1.13 compatible 11 years ago
Matt Martz 5142297076 Improvements to the rax inventory script 11 years ago
James Cammarata bf251e3dbf Correct overly broad import from chube in linode inventory script
Fixes #4875
11 years ago
Michael DeHaan 711ed7f2da Merge pull request #5940 from bcoca/inventory_plugin_vmware
vsphere/vmware inventory plugin
11 years ago
Michael DeHaan 3347b389fe Merge pull request #5995 from t0mk/devel
Added inventory plugin for hosts from ~/.ssh/config
11 years ago
James Tanner e4e64a9699 Rename lxc to libvirt_lxc 11 years ago