Monty Taylor
9f61144401
Optionally only use UUIDs for openstack hosts on duplicates
...
The OpenStack inventory lists hostnames as the UUIDs because hostsnames
are not guarnateed to be unique on OpenStack. However, for the common
case, this is just confusing.
The new behavior is a visible change, so make it an opt-in via config.
Only turn the hostnames to UUIDs if there are duplicate hostnames.
2015-12-14 10:19:43 -05:00
Monty Taylor
1f8e484b70
Fix the refresh flag in openstack inventory
...
Refresh will update the dogpile cache from shade, but doesn't cause
the ansible side json cache to be invalidated. It's a simple oversight.
2015-12-14 09:59:41 -05:00
Brian Coca
2f139dad3f
Merge pull request #12368 from coxley/nsot-inventory
...
Contrib Inventory: NSoT
2015-11-18 14:31:15 -08:00
Codey Oxley
9dcfbb1130
Removed version argument from argparse
...
This was breaking standalone execution and isn't needed
2015-11-18 14:01:30 -08:00
Brian Coca
3952fc7f97
made python 3 compatible
2015-11-13 21:57:28 -08:00
Brian Coca
7ce4903a8b
Merge pull request #12139 from amousset/rudder_inventory_plugin
...
Add Rudder inventory plugin
2015-11-12 08:12:08 -08:00
Abhijit Menon-Sen
e6a9b2cae5
Add an expand_csv_tags setting to ec2.ini
...
If enabled, this will convert tags of the form "a,b,c" to a list and use
the results to create additional inventory groups.
This is based on PR #8676 by nickpeck (but not a straight rebase—both
the code and the nomenclature have been changed here).
Closes #8676
2015-11-12 08:48:53 +05:30
Brian Coca
b2a9111b22
reversed the logic on new setting to control - replacment in groups as
...
it was wrong
fixes #13122
2015-11-11 13:35:09 -08:00
Matthew Jones
faeccb4e61
Fix ec2 infinitely nested groups
...
The ec2 inventory module will incorrectly place parent groups as child
groups of themselves, this fixes that.
2015-10-29 13:24:39 -04:00
Jason O'Donnell
7b0e68917c
Fixing typo
2015-10-26 17:13:00 -04:00
Brian Coca
2b8633cec0
Merge pull request #12855 from bcoca/ec2_inv_dash_group
...
make - replacement in group names optional
2015-10-26 13:28:35 -04:00
Brian Coca
be82e4c614
Merge pull request #10362 from emonty/fix-kwarg
...
Clean up OpenStack inventory to use a cleaner interface
2015-10-23 08:37:50 -04:00
Brian Coca
aac20aa076
removed unused exception vars
2015-10-21 22:29:27 -04:00
Brian Coca
07d584c0a7
make - replacement in group names optional
2015-10-21 13:18:32 -04:00
Monty Taylor
cac00add8d
Update to final shade inventory interface
...
shade has an inventory interface that is cleaner. We should use it.
2015-10-21 06:13:50 +09:00
Brian Coca
2c24fbbd6a
Merge pull request #12618 from AdThrive/devel
...
Added an option to use the private network IP address for DigitalOcean dynamic inventory
2015-10-12 11:35:43 -04:00
Yuri Vysotskiy
a2422bfb60
Added additional ini file search path into contrib/inventory/zabbix.py
2015-10-08 11:44:27 +03:00
jamarzka
bdd3ae9d61
Set the default use_private_network setting to False
2015-10-02 19:18:37 -04:00
jamarzka
eddfc649de
Added an option to use the private network IP address
...
This option defaults to disabled and can be set from the digital_ocean.ini file.
2015-10-02 19:16:44 -04: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
Codey Oxley
15915bb3ca
NSoT Inventory: python2.7 -> python shebang
2015-09-15 08:53:38 -07:00
Codey Oxley
c05970df2c
Added NSoT Inventory script to pull from Device resources
2015-09-15 00:53:34 -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
Alexis Mousset
cc95068dc9
Add Rudder inventory plugin
2015-08-28 10:25:18 +02: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
