Yuri Vysotskiy
a2422bfb60
Added additional ini file search path into contrib/inventory/zabbix.py
2015-10-08 11:44:27 +03:00
Will Thames
b0133d9c8f
Move connection handling failure to connect_to_aws
...
Make use of better error handling mechanism
2015-09-28 21:35:46 +05:30
Jameel Al-Aziz
57754b5a71
Fix security_token typo in ec2 inventory
2015-09-28 21:35:46 +05:30
Jameel Al-Aziz
e7890e66f3
Combine ansible/ansible#5987 and ansible/ansible#8582
...
Fixes merge conflicts and standardizes option naming
2015-09-28 21:35:46 +05:30
Jeff '2 bits' Bachtel
8c11ea5666
Add an ec2 inventory option "boto_profile" that allows
...
the use of boto profiles for separating credentials as
specified in
http://boto.readthedocs.org/en/latest/boto_config_tut.html
2015-09-28 21:35:46 +05:30
willthames
9c967dd054
Allow ec2 inventory to use a boto profile
...
This allows the EC2 inventory plugin to be used with
the same configuration against different EC2 accounts
Profile can be passed using --profile variable or using
EC2_PROFILE environment variable e.g.
```
EC2_PROFILE=prod ansible-playbook -i ec2.py playbook.yml
```
Added documentation on profiles to EC2 dynamic inventory doc
Only tries to use profiles if --profile argument is given
or EC2_PROFILE is set to maintain compatibility will boto < 2.24.
Works around a minor bug in boto where if you try and use
a security token with a profile it fails (boto/boto#2100 )
2015-09-28 21:35:46 +05:30
Ferry Boender
c6c3ce6616
Output proper JSON from vbox dynamic inventory contrib script
2015-09-26 18:25:58 +02:00
Toshio Kuratomi
3db8070aa3
Fix urlopen usage to use open_url instead
...
Add a travis test for urlopen usage
2015-09-16 20:40:17 -07:00
Toshio Kuratomi
c1039de70c
Compatibility with six-1.3.0
2015-09-08 09:46:12 -07:00
Marius Gedminas
0eb0b56722
Replace type() checks with isinstance()
...
Fixes the bug I introduced in my previous commit (six.string_types is
(basestring,) on Python 2). Thanks @abadger for noticing!
2015-09-04 09:47:17 +03:00
Marius Gedminas
37be9539ff
Python 3: use six.text_type instead of unicode
...
Replace 'unicode' with six.text_type, everywhere but in module_utils.
2015-09-04 08:40:10 +03:00
Marius Gedminas
823677b490
Replace .iteritems() with six.iteritems()
...
Replace .iteritems() with six.iteritems() everywhere except in
module_utils (because there's no 'six' on the remote host). And except
in lib/ansible/galaxy/data/metadata_template.j2, because I'm not sure
six is available there.
2015-09-03 09:23:27 +03:00
James Cammarata
ae865b9480
Merge pull request #12150 from opoplawski/cobbler
...
Fix setting dns_name in cobbler inventory
2015-09-01 12:06:57 -04:00
Jonathan Lestrelin
d56165b7f9
Add Nagios NDO inventory plugin
2015-09-01 17:10:37 +02:00
Orion Poplawski
3b17efe5bc
Fix setting dns_name in cobbler inventory
2015-08-28 15:00:04 -06:00
Marius Gedminas
3f9879aedb
Use print() as function under contrib/
...
This fixes the remaining Python 3 syntax errors, so re-enable compileall
for contrib/ again.
2015-08-28 09:18:13 +03:00
Marius Gedminas
9ae66a7f5c
Use 'except ... as' syntax in contrib/ and test/ too
2015-08-27 22:15:57 +03:00
Marius Gedminas
df1b41d3d3
Avoid types.NoneType
...
types.NoneType was removed in Python 3.
None is a singleton in Python, so 'x is None' is equivalent to
'isinstance(x, NoneType)'.
2015-08-27 22:15:56 +03:00
Brian Coca
86100da3a0
Merge pull request #11446 from cchurch/windows_azure_from_tower
...
Updates to Windows Azure inventory from Tower.
2015-08-18 15:35:51 -04:00
Brian Coca
1d402ae390
set script as executable
2015-08-17 13:42:16 -04:00
Tom Berger
8a61303c88
Move the cache file to ~/.ansible/tmp.
...
A future branch might make it configurable.
2015-08-11 18:47:32 +05:30
Tom Berger
07a4076d12
Name cache file by relevant regions - they might change between calls.
...
Also, use old school string interpolation so that the plugin is compatible with
Python < 2.7.
2015-08-11 18:47:32 +05:30
Tom Berger
cd1125aac2
Save the cache in a file specific to the RackSpace account in use.
2015-08-11 18:47:32 +05:30
Tom Berger
804489f734
Cache the results for the RackSpace dynamic inventory.
2015-08-11 18:47:32 +05:30
Chris Church
4ccdb81bf5
Updates to Windows Azure inventory script from Tower. Includes changes from https://github.com/ansible/ansible/pull/8403 .
2015-08-10 17:35:47 -04:00
Chris Church
da56312322
Openstack inventory updates from Tower. Includes changes from https://github.com/ansible/ansible/pull/10491 and https://github.com/ansible/ansible/pull/10776 .
2015-08-10 15:35:30 -04:00
James Cammarata
e2a8a68c85
Cleaning up some debugging/commented code from #11709
2015-08-07 00:28:54 -04:00
dmccue
54bab2c47e
fixed issues with output format and order key
2015-08-07 00:28:54 -04:00
dmccue
ba6b89a5b1
adjusted output behavior
2015-08-07 00:28:54 -04:00
dmccue
0ab970da98
support for _meta retrieval
2015-08-07 00:28:54 -04:00
Brian Coca
ebfd99e307
Merge pull request #8870 from photoninger/spacewalk_organizations
...
Add support for multiple organizations in spacewalk.
2015-08-07 00:00:23 -04:00
Marcos Garcia
7bd1749f48
Bug #11830 , keep working even if we use private_networking
2015-08-01 23:21:20 -04:00
Bernhard Lichtinger
aa1e00e8e7
Forgot to use commit -a to submit all changes...
2015-07-31 14:23:54 +02:00
Bernhard Lichtinger
38ff797d57
Added support for ini-file.
...
Added _meta dictionary with hostvars in --list json output.
2015-07-31 14:18:59 +02:00
Bernhard Lichtinger
13198c199e
Add support for multiple organizations in spacewalk.
2015-07-30 14:15:39 +02:00
Tomas Karasek
bb6a327c1b
fix ssh_config inventory plugin to work with paramiko 1.7.2 till 1.15.2
2015-07-29 16:58:16 +03:00
Brian Coca
b8336f222d
Merge pull request #11560 from oscarhealth/devel
...
ability to specify any combination of EC2 instance states to return
2015-07-28 21:11:30 -04:00
Brian Coca
d75b4cd190
Merge pull request #11006 from alexlo03/ec2_inventory_clear_errors
...
explain source of EC2 inventory error
2015-07-28 19:18:49 -04:00
Brian Coca
d276b69b2a
put proxmox inventory in correct dir and added to changelog
2015-07-28 18:38:23 -04:00
Brian Coca
0c21196633
moved openvz inventory script to new home
2015-07-27 20:53:53 -04:00
Andrew Hamilton
7f45c9edf7
Have ec2.py expand tilde and vars when looking up the EC2_INI_PATH env variable
2015-07-26 12:57:56 +05:30
Igor Khomyakov
8113409d34
Refactored.
...
Paramiko module is used to parse ssh_config.
Added multi-vm support
Added "_meta" element https://docs.ansible.com/ansible/developing_inventory.html#tuning-the-external-inventory-script
2015-07-21 17:55:25 +03:00
Mathieu Lecarme
1873e8ed08
GCE tag prefix for creating ansible group.
2015-07-17 22:28:30 +02:00
Jens Carl
db4f6b8878
Fix to handle user directory correctly (e.g. ~/.ansible/tmp).
2015-07-16 19:56:21 +00:00
Alex Lo
7092021d81
simplify variable names
2015-07-13 23:51:23 -04:00
Alex Lo
17b94cf139
generalize error context reporting, add elasticache explanations
2015-07-13 23:46:33 -04:00
Alex Lo
610223fbf4
explain source of EC2 inventory error
...
https://github.com/ansible/ansible/issues/10840
before
RDS: `ERROR: Inventory script (ec2.py) had an execution error: Forbidden`
EC2: `ERROR: Inventory script (ec2.py) had an execution error: Error connecting to AWS backend.
You are not authorized to perform this operation.`
after
RDS: `ERROR: Inventory script (ec2.py) had an execution error: ERROR: "Forbidden", while: getting RDS instances`
EC2: `ERROR: Inventory script (ec2.py) had an execution error: ERROR: "Error connecting to AWS backend.
You are not authorized to perform this operation.", while: getting EC2 instances`
2015-07-13 23:23:54 -04:00
Jason Young
e0a5003b27
ability to specify any combination of EC2 instance states to return
2015-07-11 20:53:05 -04:00
Brian Coca
9c5a6d7b5a
fixed all references to old plugins/inventory to point at contrib/inventory
2015-07-10 13:00:12 -04:00
Carlos E. Garcia
657495d13f
minor spelling changes
2015-07-10 12:42:59 -04:00
