ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity
28331 commits 10 branches 167 tags 272 MiB
Commit graph

215 commits

Author SHA1 Message Date
Owen Tuz
3b8d753121 Avoid cache conflicts when using multiple AWS accounts 2016-03-21 14:58:55 +00:00
Brian Coca
d026bc5e17 Merge pull request #14471 from willdurand/contrib-do-inventory 
[contrib] Add option to define group vars in DigitalOcean dynamic inventory script
 2016-03-21 07:17:46 -07:00
James Cammarata
c9da48d5ba Merge branch 'destination_format' of https://github.com/a13m/ansible into a13m-destination_format 2016-03-19 09:05:14 -04:00
Brian Coca
e1ee2ed5a5 Merge pull request #13550 from KrzysiekJ/connect_to_region-wrap 
Use wrapped connect_to_region everywhere in ec2.py
 2016-03-18 21:25:55 -07:00
Brian Coca
8838ed055c Merge pull request #14872 from bcoca/ec2_inv_page_rds 
page rds instances
 2016-03-18 20:36:46 -07:00
James Cammarata
93542b3666 Merge pull request #14964 from keedya/devel 
Fixing bug in the output format when displaying 2 or more hosts
 2016-03-18 16:38:58 -04:00
Brian Coca
eceabec71f page rds instances 
fix #14861
 2016-03-18 13:31:52 -07:00
Toshio Kuratomi
959711b56e Merge pull request #14993 from karmab/ovirt_connection_fix 
Fixes ovirt inventory to only override credentials when keys exist
 2016-03-18 11:02:14 -07:00
karimb
421fb6df8b Fixes ovirt inventory to only override credentials from environment when keys exist 2016-03-18 18:47:20 +01:00
Vlad Panainte
8259c091d6 fix logging 2016-03-18 16:25:40 +00:00
Abhijit Menon-Sen
ad0e707f97 Merge pull request #7395 from hkariti/ec2_hostname_variable 
Add hostname_variable to ec2 inventory script
 2016-03-18 15:37:00 +05:30
James Cammarata
6265d6fd2a Merge pull request #14870 from zyegfryed/patch-1 
Fix filtering by project in Cloudstask inventory
 2016-03-17 15:57:51 -04:00
Hagai Kariti
8a17da299f Clean up lines with only whitespaces in ec2.py 2016-03-17 20:06:01 +02:00
Hagai Kariti
53756af546 Added hostname_variable to ec2 inventory 2016-03-17 20:06:00 +02:00
Abhijit Menon-Sen
f0af07a5f4 Merge pull request #14761 from enbritely/fix-ec2-inventory 
Fix AWS EC2 inventory script instance_filters read
 2016-03-17 21:51:43 +05:30
Clark Boylan
7d5650219d Fix openstack inventory for multiple servers 
Fix openstack inventory for when we have multiple servers with the same
name but different IDs. Instead of giving every server with the same
name the details for the first server returned with that name add the
individual servers as they are returned.

This was a logic bug where in a loop over a list of servers we always
added the first server in that list despite having more than one server.
 2016-03-15 16:42:06 -07:00
Andre Keedy
d180e0e05f Bug Fix 
-Corrected the format in case of  multiple hosts

Remove empty spaces
 2016-03-14 16:40:39 -04:00
Monty Taylor
82c150b72f Detect empty cache files in openstack inventory 
There are cases where it makes more sense to zero out a cache file as a
form of invalidation instead of removing it. Detect those approrpriately
 2016-03-09 11:54:30 -06:00
Sébastien Fievet
83e748e315 Fix filtering by project in Cloudstask inventory 2016-03-09 11:19:39 +07:00
Brian Coca
061d35bbe3 Merge pull request #14297 from keedya/devel 
Add rackHd inventory script
 2016-03-03 18:12:15 -05:00
Joe
21ba6e9ce8 Do not use name tag for intance filter 2016-03-02 20:06:14 +01:00
Joe
5975296770 Fix AWS EC2 external inventory script config read 
EC2 inventory scripts reads configuration from an INI file. The `instance_filters` option controls which EC2 instances are retrieved for inventory. Filling this option and running the inventory script with Python 3 crashes with the following error:

```python
Traceback (most recent call last):
  File "./contrib/inventory/ec2.py", line 1328, in <module>
    Ec2Inventory()
  File "./contrib/inventory/ec2.py", line 163, in __init__
    self.read_settings()
  File "./contrib/inventory/ec2.py", line 393, in read_settings
    for instance_filter in config.get('ec2', 'instance_filters', '').split(','):
TypeError: get() takes 3 positional arguments but 4 were given
```

The problem is the last parameter of config.get() call, because `fallback` keyword argument is not specified.

The fix handles epmpty `instance_filers` in case of Python 2&3
 2016-03-02 19:44:25 +01:00
Monty Taylor
c737bd48bc Deduplicate true duplicate entries in the openstack inventory 
There are cases where the host list back from the cloud comes back
duplicated. This causes us to report those with UUIDs, which we do to
support truly different servers with the same name. However, in the case
where duplicate host entries have the same UUID, we can know it's a data
hiccup.
 2016-02-24 12:36:50 -06:00
William Durand
369cb8fa9f
[contrib] Add option to define group vars in DigitalOcean dynamic inventory script 2016-02-14 17:04:26 +01:00
James Cammarata
1b3c669ebe Merge pull request #14428 from shawnsilva/linode-invscript-addips 
Linode Dynamic Inventory: Add public IP's as hostvars
 2016-02-11 22:46:39 -05:00
Brian Coca
3ddcabee0e Merge pull request #14093 from MatthaeusHarris/proxmox_4_inventory 
Proxmox 4 inventory
 2016-02-11 01:39:33 -05:00
Shawn Silva
f450a4cb69 When the linode inventory is generated the linode label is used as the 
inventory host. If the label isn't a FQDN ansible can't connect.
This will set the hostvars for the ansible_ssh_host to the linodes public IP.
 2016-02-10 18:54:52 -05:00
Andre keedy
e46074c791 Address comments 2016-02-04 17:00:21 -05:00
Andre keedy
083530d8fa Fix erros 2016-02-03 17:00:58 -05:00
Andre keedy
22382726fa Add rackHd inventory script 
- Allow ansible to get hosts inventory from rackHD by node id
 2016-02-03 15:42:05 -05:00
Anthony Robinson
b73c7728f4 Update example vpc_desitnation_variable example with working settings 2016-02-01 11:05:46 -05:00
Brian Coca
37eac4592e added back --profile to keep backwards compat 
this was broken by #12548
 2016-01-30 11:35:11 -05:00
Matt Harris
f8e73714f6 If the notes don't contain JSON, add the string to the notes key of _meta 2016-01-24 01:10:47 -08:00
Matt Harris
e5493fa631 Added support for proxmox 4.x 2016-01-24 00:57:40 -08:00
Matthew Jones
a1318e1664 Add rax cache age ini documentation 2016-01-20 15:27:06 -05:00
Matthew Jones
a106382786 Add a config option for rackspace inventory cache 
Adding a config and environment variable option for tuning the cache age
check in the rackspace inventory module
 2016-01-20 15:03:56 -05:00
Krzysztof Jurewicz
73160e65e5 Use wrapped connect_to_region everywhere in ec2.py 2015-12-15 12:03:50 +01:00
Brian Coca
938c26d952 Merge pull request #13544 from emonty/inventory-config 
Add OpenStack Inventory configuration
 2015-12-14 13:22:19 -05:00
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
Toshio Kuratomi
6472b3daee Merge pull request #13157 from fghaas/lxc 
LXC inventory scripts: fix libvirt_lxc, add lxc
 2015-12-04 10:57:50 -08: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
Florian Haas
0bc32cbaee Correct connection type returned by libvirt_lxc inventory script 
The correct connection type for LXC containers managed via libvirt is
libvirt_lxc, not lxc.
 2015-11-13 15:43:12 +01: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
Marc Abramowitz
7bdc3cdb15 Add optional logging to consul_io inventory script 
Configured with environment variables -- e.g.:

    ANSIBLE_INVENTORY_CONSUL_IO_LOG_ENABLED=1 ANSIBLE_INVENTORY_CONSUL_IO_LOG_LEVEL=DEBUG /path/to/consul_io.py --list

This gives some verbose logging, including showing all HTTP requests being
made, which I am finding useful, as I am trying to improve the performance of
this script.
 2015-08-26 10:57:26 -07: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
Andy Grimm
009d0a4bb4 Flexible tag-based naming for ec2 hosts 
Introduces destination_format and destination_format_tags
to allow the construction of host names based on one or
more ec2 tags and a python format string.
 2015-07-28 13:14:40 -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
Brian Coca
0bbf5927be added executabel bit to nova and rax inventory plugins 2015-07-10 10:30:33 -04:00
Brian Coca
d0c6d2ff1c poreted log_plays, syslog_json and osx_say callbacks to v2 
renamed plugins to contrib (they are not really plugins)
rewrote README.md to reflect new usage
added new dir to setup.py so it gets copied with installation, in views
of making using inventory scripts easier in teh future
 2015-07-10 10:30:33 -04:00