André Cruz
1fdb7613f1
Fix whitespace.
2016-05-23 10:45:37 +01:00
André Cruz
18831c72f9
Use the python executable specified by the environment.
2016-05-23 10:45:06 +01:00
Victor Costan
8d3da09eae
contrib/inventory/ec2.py can read AWS credentials from ec2.ini ( #15378 )
2016-05-20 09:29:15 -04:00
Chris Mague
aaaab42456
update documentation ( #15838 )
2016-05-16 10:44:35 -04:00
James Cammarata
37737ca6c1
Merge pull request #15466 from alikins/pr_10555_cobbler_auth_rebase
...
add cobbler api authentication options
2016-05-11 15:17:37 -04:00
Matt Hite
fbfc24fb40
New inventory_ip_type option in gce inventory tool
2016-05-03 15:32:12 -07:00
Chris Houseknecht
21f2556662
Update and fix typos in docker inventory docstrings. ( #15616 )
2016-04-27 17:17:34 -04:00
Brian Coca
783dc2f0f6
errors now print to stderr
2016-04-25 11:43:54 -04:00
Francisco Ros
574163c949
Brook inventory ( #15264 )
...
* Initial work on Brook.io dynamic inventory
* Handle error cases in Brook.io dynamic inventory
* Remove defaults from brook.ini
* Update Brook.io dynamic inventory for libbrookv0.3
Use authentication api to obtain a valid JWT from an API Token.
* Remove defaults from brook.ini
2016-04-25 11:42:57 -04:00
Jorge Nerín
3a3e69f830
Fix substituting dots for underscores when using ips ( #15578 )
...
ec2.py was substituting the dots on ip addresses when not using hostnames like:
"ec2": [
"10_10_1_1",
now it's:
"ec2": [
"10.10.1.1",
2016-04-25 10:22:00 -04:00
Matt Martz
5549292d69
Use exception as syntax in inventory, as it doesn't require py24 ( #15554 )
2016-04-22 16:34:35 -04:00
Brian Coca
6a983b0fc4
fixed misspelled var
2016-04-22 15:19:44 -04:00
Chris Houseknecht
221b1c9fd0
Refactored docker inventory. ( #15485 )
2016-04-22 15:19:12 -04:00
Chris Houseknecht
2b7f4395d6
Allow to work with latest Azure Python SDK ( #15467 )
...
* Allow to work with latest Azure Python SDK
* Fixed so that errors are sent to stderr
2016-04-21 23:18:45 -04:00
chouseknecht
af5e4abf66
Rename azure inventory script. Fix bug preventing AD user login via environment vars.
2016-04-21 14:34:08 -04:00
Jerry Zhao
9278591758
add cobbler api authentication options
...
add cobbler api authentication options: username and password, which
can be provided if authentication is enabled or cobbler api is behind
a proxy that needs authentication.
2016-04-18 17:29:03 -04:00
chouseknecht
a5bed1570e
Adding new Azure inventory script.
2016-04-16 01:36:25 -04:00
David Shrewsbury
22467a0de8
Merge pull request #15232 from donovan/fix-openstack-config-file-name
...
add openstack.yml to CONFIG_FILES to be consistent with documentation
2016-04-12 22:29:45 -04:00
David Chan
5b81853c04
Fix CACHE_DIR mode in contrib/inventory/spacewalk.py
2016-04-01 20:35:19 -04:00
Donovan Jones
2268ea9a7f
add openstack.yml to CONFIG_FILES to be consistent with documentation
2016-04-01 11:26:12 +13:00
Abhijit Menon-Sen
4db7e12898
Merge pull request #12113 from msabramo/contrib_inventory_consul_io_add_logging
...
Add optional logging to consul_io inventory script
2016-03-26 17:24:55 +05:30
Matt Martz
bb6e05a176
Fix indentation in ovirt.py inventory
2016-03-22 20:33:40 -05:00
Abhijit Menon-Sen
9005f91bb0
Merge pull request #15068 from OwenTuz/issue-15067
...
Name the AWS inventory cache based on the profile in use
2016-03-22 05:51:14 +05:30
Brian Coca
6bf92e7398
Merge pull request #15037 from vladpanainte/gce_fix
...
remove logging warning from GCE inventory
2016-03-21 11:03:44 -07:00
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
Matt Martz
7bfb689de2
Merge pull request #8561 from sivel/vault-keyring-example
...
Add vault-keyring.py example script
2016-02-18 14:40: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