Commit graph

297 commits

Author SHA1 Message Date
Brian Coca
468770c894 Merge pull request #11261 from schrodervictor/adds-elasticache-to-ec2-dynamic-inventory
Adds ElastiCache to ec2 dynamic inventory plugin
2015-06-30 16:51:11 -04:00
Brian Coca
62e780c74a moved to actual live plugin directory and ported to v2 2015-06-29 20:45:50 -04:00
Brian Coca
2a8ab4ab3e Merge pull request #9765 from runseb/update
Add tags for inventory
2015-06-29 20:41:14 -04:00
Victor Schröder
df77d087a5 Adds the check for 'not None' also when building host_info dict for ElastiCache clusters, nodes and replication groups 2015-06-29 23:28:55 +02:00
Victor Schröder
d88a42570e Adds a check for 'not None' values when iterating ElastiCache SecurityGroups keys 2015-06-29 21:56:36 +02:00
Erik Weathers
fde99d8095 change 'stage' to 'staging', as it a much more common term for a pre-production environment, and there are already many references to 'staging' appearing in the ansible code and docs, so let's be consistent 2015-06-26 23:38:06 -07:00
Tom Paine
410285ecd6 add simple prefix filtering to vmware inventory
Significantly speeds up inventory collection on systems with many
excluded machines.
2015-06-17 18:41:54 +01:00
rncry
16f66a39a6 support instances with no public ip
default to private ip if the instance doesn't have a public ip assigned. (causes list index out of range error otherwise)
2015-06-17 17:22:28 +01:00
Brian Coca
8cfec0a27a Merge pull request #11297 from msabramo/serf_plugin_use_env_vars
Simplify serf inventory plugin
2015-06-17 11:31:57 -04:00
Marc Abramowitz
dc63bbf0b9 Simplify serf inventory plugin
using newly added `EnvironmentConfig` class in `serfclient`.

See https://github.com/KushalP/serfclient-py/pull/17
2015-06-17 08:20:56 -07:00
Brian Coca
cce6edeb6c Merge pull request #11293 from tamsky/tamsky-patch-1
for tags with empty value, do not append separator
2015-06-17 09:55:07 -04:00
Marc Abramowitz
ce42c66e27 plugins/inventory/serf.py: Use SERF_RPC_* env vars
This makes the Serf inventory plugin use the `SERF_RPC_ADDR` and
`SERF_RPC_AUTH` environment variables that the `serf` command-line tool
already uses.

These can be used to get Serf data from a remote node instead of
requiring the ansible control host to be running a serf agent and to be
a member of the serf cluster.
2015-06-16 21:11:36 -07:00
Marc Tamsky
a0e8b9ef98 for tags with empty value, do not append separator 2015-06-16 19:28:53 -07:00
Marc Abramowitz
336f45f5b3 Add serf inventory plugin
Add inventory plugin for [Serf](https://serfdom.io/).
Requires [`serfclient` Python module](https://pypi.python.org/pypi/serfclient).
2015-06-16 08:23:38 -07:00
Vebryn
b1574ecfce Update syslog_json.py
localhost is better than locahost ;)
2015-06-16 16:13:01 +02:00
Victor Schröder
d164c9c7a0 Adds explanation about all_elasticache_nodes and all_elastic_clusters settings 2015-06-15 11:36:33 +02:00
Victor Schröder
2acfbce64d Removes unnecessary commented code and replaces with useful information 2015-06-15 11:35:25 +02:00
Victor Schröder
f2d22c1373 Fixes error messages to mention ElastiCache 2015-06-15 10:02:54 +02:00
Victor Schröder
e8c3e3d645 Cleans some unnecessary white spaces in ec2.py dynamic inventory plugin 2015-06-14 23:38:09 +02:00
Victor Schröder
77a2ad0e8c Improves code organization in get_dict_from_describe_dict method 2015-06-14 23:32:10 +02:00
Victor Schröder
41b034a5d2 Process information about replica clusters for ElastiCache replication groups 2015-06-14 23:29:55 +02:00
Victor Schröder
e692a18a29 Process information about primary clusters for ElastiCache replication groups 2015-06-14 23:29:05 +02:00
Victor Schröder
43f9a653d0 Process CacheNodeIdsToReboot complex type for cache clusters 2015-06-14 23:27:16 +02:00
Victor Schröder
ffd74049da Comments about the naming pattern in the script, that certainly deserves future refactoring 2015-06-14 23:24:51 +02:00
Victor Schröder
f25ad9dc51 Adds the appropriate key checks for ElastiCache replication groups in get_dict_from_describe_dict method 2015-06-14 23:21:33 +02:00
Victor Schröder
069ee11699 Creates add_elasticache_replication_group method in ec2.py dynamic inventory script 2015-06-14 23:18:30 +02:00
Victor Schröder
c18f6cae11 Creates get_elasticache_replication_groups_by_region method to handle the API call 2015-06-14 23:15:33 +02:00
Victor Schröder
40ce072747 Adds the logic to process the new config entries about ElastiCache replication groups 2015-06-14 23:14:00 +02:00
Victor Schröder
22020ac3cd Adds the necessary config entries to ec2.ini, to support ElastiCache replication groups 2015-06-14 23:12:52 +02:00
Victor Schröder
e64daba8e7 Adds a flag (is_redis) to prevent duplicity of information about Redis single node clusters 2015-06-14 23:10:33 +02:00
Victor Schröder
2a242a0e1b Creates add_elasticache_node method in ec2.py 2015-06-14 23:08:39 +02:00
Victor Schröder
98a5531966 Makes the API requests to return nodes' information too 2015-06-14 23:03:15 +02:00
Victor Schröder
dbb0304cea Adds uncammelize helper method to put the labels in the expected output format 2015-06-14 23:01:13 +02:00
Victor Schröder
c6f2b08a60 Creates get_host_info_dict_from_describe_dict helper method to translate information from a 'describe' call (we don't have instance objects in this case) 2015-06-14 22:57:03 +02:00
Victor Schröder
2cd76cf0e3 Creates add_elasticache_cluster method to digest the API answer about ElastiCache clusters 2015-06-14 22:41:05 +02:00
Victor Schröder
06c6db8e6b Adds get_elasticache_clusters_by_region method to perform the API call to AWS (and sadly finds out that Boto support for ElastiCache is very outdated...) 2015-06-14 22:21:40 +02:00
Victor Schröder
50b320615e Little improvement in the organization of the configuration loader method 2015-06-14 22:13:27 +02:00
Victor Schröder
bc80bd36af Adds the necessary logic to ec2.py to load ElastiCache related configuration 2015-06-14 22:12:03 +02:00
Victor Schröder
382c6fe05b Adds basic configuration to ec2.ini to support ElastiCache Clusters and Nodes 2015-06-14 22:07:39 +02:00
sirkubax
0f68db2d7e Update ec2.ini
Warning about usage boto+ec2.ini
2015-06-11 11:51:35 +02:00
joshainglis
f0fb2e7f65 Removed shebang line from .ini file 2015-06-08 13:01:54 +10:00
joshainglis
23460e6480 Removed a dictionary comprehension for python 2.6 support 2015-06-04 17:59:53 +10:00
joshainglis
7692391568 Removed some text 2015-06-04 17:35:10 +10:00
joshainglis
efc3d2931e Fixed typo 2015-06-04 17:07:08 +10:00
Brian Coca
67d065c758 Merge pull request #10946 from izhukov/inventory-DO-api-v2
Update DigitalOcean dynamic inventory to API v2
2015-06-03 14:06:25 -04:00
Monty Taylor
96759cda82 Add deprecation notices to the old nova inventory 2015-05-20 14:01:58 -07:00
Aleksey Zhukov
b7d644d484 Fix broken cache logic 2015-05-14 09:42:48 +03:00
Aleksey Zhukov
3861597696 Bring back cache 2015-05-13 18:12:48 +03:00
Aleksey Zhukov
0d3e015dd1 Update DigitalOcean dynamic inventory to API v2 2015-05-07 22:53:10 +03:00
Brian Coca
69ac1b7eee Merge pull request #9835 from resmo/feature/cloudstack-inventory
cloudstack: add dynamic inventory
2015-05-04 11:30:04 -04:00