cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
13956 commits 47 branches 390 tags 440 MiB
Commit graph

241 commits

Author SHA1 Message Date
Jon Hawkesworth
d2c83bf007 Add simple plugin that times ansible-playbook runs. 2014-11-03 21:30:41 +00: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
Andrew Rothstein
fbc1cd553c an ansible inventory garnered from fleetctl 2014-10-14 07:29:21 -04:00
Adam Young
428674cb90 Inventory Plugin to get hostgroups from FreeIPA 2014-10-10 21:26:17 -04:00
Marc Abramowitz
7cc5ecae52 nova.ini: Distinguish between required and optional settings 
Put them in separate sections of config to make it more clear what is
essential and what is not. Also comment out the optional settings.
And remove duplicate mention of `service_type`.
 2014-10-01 15:19:05 -04:00
Marc Abramowitz
1560b963aa nova.py: Support OS_AUTH_SYSTEM and OS_REGION_NAME 2014-10-01 15:19:05 -04:00
Marc Abramowitz
cd5edc416c nova.py: Set defaults for OpenStack settings 
- auth_system
- region_name
- service_type

These are config settings that could be left out in many scenarios, but
the current code is requiring them. In particular, "service_type" is a
new one in PR #7444 so if we add that and don't set a default, then
existing .ini files won't work:

```
  File
"/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/ConfigParser.py",
line 618, in get
    raise NoOptionError(option, section)
ConfigParser.NoOptionError: No option 'service_type' in section:
'openstack'
```
 2014-10-01 15:19:04 -04:00
Carson Gee
eccb48c8da Improvements to OpenStack inventory script 2014-10-01 15:19:04 -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
Michael DeHaan
51e014d915 Merge pull request #8012 from cchurch/callback_cleanup 
Callback plugin cleanup
 2014-07-03 19:29:59 -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
afbc7f8a0f Change parameter from pattern to name for playbook_on_play_start in example callback plugins. 2014-07-01 17:06:44 -04:00
Chris Church
955dadf743 Remove runner_on_error callback that is never used. 2014-07-01 17:02:10 -04: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
Mahemoff
1640788f30 Remove debugging line (hipchat notification) 2014-03-19 18:15:20 +00:00
Mahemoff
989913bc21 Change hipchat notification default to true 2014-03-19 18:08:30 +00:00
Mahemoff
b4053b67d1 Make hipchat "notify" flag optional (default off) 2014-03-19 09:55:49 +00: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
Michael DeHaan
3347b389fe Merge pull request #5995 from t0mk/devel 
Added inventory plugin for hosts from ~/.ssh/config
 2014-03-16 15:23:53 -05:00
Michael DeHaan
7b2fb7e2d1 Merge pull request #6376 from sivel/hipchat-callback 
New Callback Plugin: hipchat.py
 2014-03-16 11:31:23 -05:00
Matt Martz
c3667b7b51 First pass at hipchat example callback plugin 2014-03-11 18:36:32 -05:00
James Tanner
e4e64a9699 Rename lxc to libvirt_lxc 2014-03-11 16:16:24 -04:00
James Cammarata
bca6adc812 Merge pull request #4064 from mscherer/lxc 
Add a plugin that permit to use ansible for lxc system, using libvirt
 2014-03-11 15:12:51 -05:00
Michael DeHaan
ab80d1c62b Merge pull request #5899 from jjneely/ec2.py 
ec2.py: Make sure ec2_placement gets handled correctly
 2014-03-11 10:25:01 -05:00
Franck Cuny
54b3262e71 Remove mention to AWS in Linode's inventory script. 2014-03-08 17:14:10 -08:00
Dolph Mathews
8808e029f9 spelling correction for "separate" 
s/seperate/separate/

http://en.wiktionary.org/wiki/separate
 2014-03-08 04:51:34 -06:00
Franck Cuny
6294264dc4 Add credential parameters to the GCE modules. 
In order to simplify the workflow with the GCE modules, it's now
possible to add the parameters and project name as arguments to the
various GCE modules.

The inventory plugin also returns the IP of the host in
`ansible_ssh_host` so that you don't have to specify IPs into the
inventory file.

Some update to the documentation are also added.

Closes #5583.
 2014-03-04 19:27:49 -08:00
Tomas Karasek
7b7c6c38bc Added inventory plugin for hosts from ~/.ssh/config 2014-02-13 16:33:25 +02:00
Brian Coca
f3c2256554 vsphere/vmware inventory plugin 
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
 2014-02-10 14:18:00 -05:00
Aaron Rice
a326d24446 Save api id to index as an int instead of a list 2014-02-09 16:33:34 +00:00
Jack Neely
42b01dac9b ec2.py: Make sure ec2_placement gets handled correctly 
ec2_placement was missing from the inventory variables ec2.py was
producing.  Make sure that gets properly included rather than ignored.
 2014-02-06 15:10:20 -05:00
Timur Batyrshin
658c15930e reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852) 2014-02-03 13:00:40 -06:00
Michael DeHaan
26676ce2e2 update default EC2 exclude regions -- this should be the best configuration for most users, but some may still want to tweak. 2014-01-19 13:13:43 -05:00
jctanner
57d54c1da5 Merge pull request #5236 from willthames/ec2_inv_rds_fail_safe 
ec2 inventory: Fail EC2 inventory better with restricted EC2 users
 2014-01-06 12:57:21 -08:00
jctanner
fd4ae165e4 Merge pull request #5153 from willthames/ec2_inventory_multiuser 
Allow multiple users to use ec2 inventory scripts
 2014-01-06 12:55:08 -08:00
Will Thames
e9a0aff77c Fail EC2 inventory better with restricted EC2 users 
If a user has full EC2 access but no RDS access, the user
should still be able to query the EC2 inventory, although
will not obtain any information about any RDS instances.
 2013-12-10 21:32:54 +10:00
Lorrin Nelson
663deff2c2 Fix loading from cache in ec2.py inventory plugin. 2013-12-05 21:33:25 -08:00
Lorrin Nelson
94d60b53de ec2 inventory now include Ansible 1.3 style _meta data each host. 2013-12-05 11:40:18 -08:00
willthames
3a0d2860e0 Allow multiple users to use ec2 inventory scripts 
Move the ec2 cache files from a shared /tmp location to the
user's ansible tmp directory.
 2013-12-04 11:42:44 +10:00
Eric Johnson
8ff58eb46e fixes #4954 plus updates for gcutil/v1beta16 tests 2013-11-19 22:30:22 +00:00
Michael DeHaan
30e72a4b1b Merge pull request #4842 from cchurch/devel 
Retrieve EC2 state when using newer versions of Boto
 2013-11-18 11:45:56 -08:00
James Tanner
5eaaca68d1 Merge pull request #4005 from herbyg-axial/ansible/ 
ec2 inventory script: Add a global group for EC2 and RDS instances when listing EC2 inventory
 2013-11-11 14:09:34 -05:00
Chris Church
a6135c1c16 Support retrieving EC2 state/previous_state when using newer versions of Boto. 2013-11-07 16:04:55 -05:00
Paul Durivage
f63a6fafe9 Move regions until after authentication; otherwise pyrax.regions is an empty tuple and no inventory is returned. 2013-10-29 13:47:26 -05:00
Paul Durivage
3bfdaad060 Implement @cchurch suggestions 2013-10-29 13:47:26 -05:00
Paul Durivage
859c6c6d44 Make creds file env var optional; look for ~/.rackspace_cloud_credentials if not supplied 2013-10-29 13:47:26 -05:00