Ryan S. Brown
59e499f8f0
Respect profiles & credentials for boto3 inventory
...
Using boto3 directly wasn't properly using profiles set in the `ec2.ini`
file, this change uses the `module_utils` boto3_conn instead.
2016-07-06 10:57:31 -04:00
Tom Paine
418f91d0e2
Fail softly when boto3 is not installed
...
Updated as per @ryansb comments. The EC2 inventory script will now fail
with a useful message when boto3 is not installed and the user is trying
to read RDS cluster information.
2016-07-06 10:57:31 -04:00
Tom Paine
bb5a1f7440
Add RDS cluster info to EC2 dynamic inventory
...
Add db_clusters to the ec2 inventory. Show tags. Only show clusters
matching tags in the `.ini`. Set `include_rds_clusters = True` option to
enable RDS cluster inventory collection.
Example inventory output:
```
{
"db_clusters": {
"ryansb-cluster-test": {
"AllocatedStorage": 1,
"AvailabilityZones": [
"us-west-2a",
"us-west-2b",
"us-west-2c"
],
"BackupRetentionPeriod": 1,
"DBClusterIdentifier": "ryansb-cluster-test",
"DBClusterMembers": [
{
"DBClusterParameterGroupStatus": "in-sync",
"DBInstanceIdentifier": "ryansb-test",
"IsClusterWriter": true,
"PromotionTier": 1
},
{
"DBClusterParameterGroupStatus": "in-sync",
"DBInstanceIdentifier": "ryansb-test-us-west-2b",
"IsClusterWriter": false,
"PromotionTier": 1
}
],
"DBClusterParameterGroup": "default.aurora5.6",
"DBSubnetGroup": "default",
"DatabaseName": "mydb",
"DbClusterResourceId": "cluster-OB6H7JQURFKFD4BYNHG5HSRLBA",
"Endpoint": "ryansb-cluster-test.cluster-c9ntgaejgqln.us-west-2.rds.amazonaws.com",
"Engine": "aurora",
"EngineVersion": "5.6.10a",
"MasterUsername": "admin",
"Port": 3306,
"PreferredBackupWindow": "06:09-06:39",
"PreferredMaintenanceWindow": "mon:11:22-mon:11:52",
"ReadReplicaIdentifiers": [],
"Status": "available",
"StorageEncrypted": false,
"VpcSecurityGroups": [
{
"Status": "active",
"VpcSecurityGroupId": "sg-47eaea20"
}
]
}
},
"rds": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com",
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"rds_aurora": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com",
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"rds_parameter_group_default_aurora5_6": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com",
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"ryansb-test": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"ryansb-test-us-west-2b": [
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"type_db_r3_large": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com",
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"us-west-2": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com",
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"us-west-2a": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"us-west-2b": [
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
],
"vpc_id_vpc_3ca34459": [
"ryansb_test_c9ntgaejgqln_us_west_2_rds_amazonaws_com",
"ryansb_test_us_west_2b_c9ntgaejgqln_us_west_2_rds_amazonaws_com"
]
}
```
2016-07-06 10:57:31 -04:00
Shota
47f715fb37
Fix some typos ( #16498 )
2016-06-29 14:31:25 -04:00
Ryan Brown
467062f488
Merge pull request #16286 from kwoodson/gce_instance_states
...
Adding instance_states to gce inventory to align with other inventories.
2016-06-20 16:16:13 -04:00
Kenny Woodson
ebf1feb5bb
Adding instance_states option to gce inventory
2016-06-17 10:11:23 -04:00
Adam Thomas
27d0fe8d49
The output of the digital ocean script was invalid for ID and droplet name groups. Hosts is now an array of strings rather than a string for these groups. ( #16297 )
2016-06-15 09:49:14 -04:00
bqbn
3498b840c9
Fixes #16095 : Maximumly 199 filter values ( #16184 )
...
When making calls to AWS EC2 api with DescribeTags actiion and if the
number of filter values is greater than or equal to 200, it results in
400 bad request reply and the error message is:
"Error connecting to AWS backend.\n The maximum number of filter values specified on a single call is 200".
The change is so that we call get_all_tags with maximum 199 filter
values one at a time until all are consumed.
2016-06-13 11:19:42 -04:00
jctanner
aa5c8ed86c
* Fix broken indentation in vmware inventory ( #16177 )
...
* Allow script to be a symlink without breaking ini path.
2016-06-07 18:10:57 -04:00
Monty Taylor
4eedad55d9
Merge pull request #14699 from jhesketh/devel
...
Set fail_on_cloud_config in openstack inventory
2016-06-07 11:21:51 +03:00
Chris Houseknecht
9c505e2fa9
Merge pull request #15965 from edevil/python_env
...
Update interpreter for azure inventory script
2016-06-05 20:02:32 -04:00
Florian Haas
0e6fc9de3a
Add inventory script for LXC containers
...
Enables an LXC server's configuration as an inventory source for LXC
containers.
In LXC, containers can be defined with an "lxc.group" configuration
option that is normally used with lxc-autostart -g. Here, we are using
the same option to build Ansible inventory groups.
In addition to being grouped according to their lxc.group entry (or
entries, as LXC allows a single container to be in multiple groups),
we also add all containers (including those with no lxc.group entry)
to the "all" group.
2016-06-03 23:22:56 +03:00
Brian Coca
3121e352f7
fixed group assignment in DO inventory ( #16102 )
...
* fixed group assignment in DO inventory
* changed sets to lists as we are appending dicts
* deeper fix as original data structure was flawed
2016-06-03 15:13:13 -04:00
jctanner
018d3c3118
Add a new vmware inventory script backed by pyvmomi ( #15967 )
...
Add a new dynamic vmware inventory script backed by pyvmomi
2016-05-30 20:41:48 -04:00
Adrian Likins
675561e116
fix vault-keyring.py 'No [vault] section' error
...
vault-keyring.py was using an older version of
the ansible.constants.load_config_file() API.
The newer version returns a tuple, which caused
the config load to fail and a catch all exception
to blame it on a missing section.
Update to new API, and catch the ConfigParser error
specifically.
Fixes #15984
2016-05-24 18:47:56 -04:00
Adam Chainz
064ed63843
Fix ec2 inventory for potentially inconsistent data ( #12642 )
2016-05-24 11:00:59 -04:00
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
Joshua Hesketh
c3ffe0a838
Allow fail_on_errors in openstack inventory
...
Add support for a new option to the openstack inventory. This is so
should one cloud be unavailable you can still list hosts from any
other openstack clouds you have configured.
This is exposed as an option under the extra config part of ansible
in the openstack clouds.yaml.
2016-04-05 20:31:54 +10: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