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
Marc Abramowitz
26cc0b3780
nova.py: indented and sorted JSON output
2014-06-30 21:42:21 -07:00
Marc Abramowitz
685fae4d9c
nova.py: Remove DOCUMENTATION block
...
@mpdehaan said that nothing uses them at
https://github.com/ansible/ansible/pull/7988#issuecomment-47600006
2014-06-30 16:54:27 -07:00
James Cammarata
12f7c9871e
Merge pull request #7555 from icebourg/softlayer_inventory
...
SoftLayer Inventory script
2014-06-12 12:42:22 -05:00
Martin Joehren
188a13efc0
azure - fix for: temporary redirect, not deleted vhds, missing locations and role types, async api calls
2014-06-08 00:36:55 +02:00
James Cammarata
e083168773
Merge branch 'devel' of https://github.com/jwhitbeck/ansible into jwhitbeck-devel
2014-06-06 11:19:43 -05:00
Hector Acosta
a080873e7c
Show friendlier error message if nova.ini is not found.
...
Signed-off-by: Hector Acosta <hector.acosta@gmail.com>
2014-06-05 13:07:38 -05:00
Sean Whitbeck
bbfb949bee
Add windows azure inventory plugin
2014-05-29 16:38:09 -07:00
AJ Bourg
a9ba02ff04
Update dependencies. Add some doc notes.
2014-05-26 16:57:41 -06:00
AJ Bourg
27e99f2a84
Update some doc strings
2014-05-26 16:36:32 -06:00
AJ Bourg
5986959597
Remove some development code. EC2 -> SoftLayer
2014-05-23 14:47:46 -06:00
AJ Bourg
79f2dca60a
Initial SoftLayer API inventory client.
2014-05-23 14:33:47 -06:00
Paul Durivage
b9f7da7b44
Docker client occasionally returns a NoneType, so we have to catch the TypeError
2014-05-05 10:51:58 -05:00
Christian Berendt
6676720ce5
fixed typos found by RETF rules in PY files
...
rules are avaialble at https://en.wikipedia.org/wiki/Wikipedia:AutoWikiBrowser/Typos
2014-05-03 18:40:05 +02:00
Lorin Hochstein
27f305ae08
Document how to turn off ec2 cache
...
Document how to disable cache lookup with the ec2 inventory script
2014-04-29 12:13:55 -04:00
Carlos E. Garcia
7f5dd5e85d
multiple spelling error changes
2014-04-29 10:41:05 -04:00
James Cammarata
442c68f7e8
Merge pull request #7025 from angstwad/docker_inv
...
Add Docker inventory plugin
2014-04-23 16:06:25 -05:00
James Cammarata
d5e4b665a5
Merge pull request #7004 from danfaizer/abiquo-inventory-plugin
...
Added dynamic inventory plugin for Abiquo
2014-04-23 15:54:58 -05:00
Paul Durivage
f0bb3aeeea
Add Docker inventory plugin
2014-04-16 11:27:36 -05:00
danfaizer
7867335702
Added Abiquo inventory plugin
2014-04-16 00:36:38 +02:00
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.
2014-04-14 19:05:44 -04:00
Matt Martz
21a2d32ffc
Fix empty group in rax.py output
2014-04-12 15:57:59 -04:00
Michael DeHaan
df0a4b735a
Merge pull request #6603 from sivel/rax-inventory-improvements
...
rax.py inventory script improvements
2014-04-03 17:03:04 -04:00
Ingmar Hupp
cc01f7b7f5
Do not filter out RDS instances by default or in INI file to avoid changing current behaviour.
2014-03-27 18:58:46 +00:00
Ingmar Hupp
456d2627e8
EC2 inventory toggle to exclude/include RDS instances.
2014-03-27 15:57:24 +00:00
Henry Finucane
7626eacc7a
Make ssh_config paramiko 1.12/1.13 compatible
2014-03-26 17:34:04 -07:00
Matt Martz
5142297076
Improvements to the rax inventory script
2014-03-20 12:47:00 -05:00
James Cammarata
bf251e3dbf
Correct overly broad import from chube in linode inventory script
...
Fixes #4875
2014-03-19 15:54:29 -05:00
Michael DeHaan
711ed7f2da
Merge pull request #5940 from bcoca/inventory_plugin_vmware
...
vsphere/vmware inventory plugin
2014-03-16 15:29:15 -05:00