Commit graph

235 commits

Author SHA1 Message Date
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
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
Carlos E. Garcia
cfbfd38723 just a few spelling error changes 2015-04-28 09:36:42 -04:00
Rene Moser
d9633037d5 cloudstack: update copyright in dynamic inventory 2015-04-28 09:20:54 +02:00
Rene Moser
9e5a16703b cloudstack: add check for empty inventory 2015-04-28 09:20:54 +02:00
Milamber
bfa71054f5 Fix an issue when the cloudstack installation don't have any instance group 2015-04-28 09:20:54 +02:00
René Moser
92a25b340b cloudstack: add dynamic inventory
Signed-off-by: René Moser <mail@renemoser.net>
2015-04-28 09:20:54 +02:00
Paul Logston
e8768b2b87 Use six to check for string_types 2015-04-25 19:45:22 -04:00
Paul Logston
50932ce556 Use six.moves to import configparser 2015-04-25 17:06:01 -04:00
Paul Logston
1674b47445 Make ec2 inventory plugin Python 3 compatible 2015-04-24 21:14:06 -04:00
James Laska
1359bbee87 Fix traceback with using GCE on EL6 with python-crypto2.6
This fix resolves an issue on EL6 systems where there may be multiple versions
of pycrypto installed.  EPEL provides both `python-crypto` and
`python-crypto2.6`.  These packages are co-installable.  However, modules
importing the `Crypto` library must specify which version to use, otherwise the
default will be used.

This change follows the same pattern established in `bin/ansible` for
specifying python library requirements.
2015-04-20 12:49:25 -04:00
Romain Dartigues
e38eb2589a Undefined names found by pyflakes 2015-04-19 18:18:52 +02:00
Brian Coca
309bbda5c4 Merge pull request #10574 from joefis/patch-1
Vagrant inventory: exit 0 on success
2015-04-15 15:33:16 -04:00
Brian Coca
8d871f9650 Merge pull request #7444 from carsongee/cg/nova_inventory_improvements
Improvements to OpenStack inventory script
2015-04-14 14:59:41 -04:00
Brian Coca
af960fe8d5 Merge pull request #9624 from andrewrothstein/devel
an ansible inventory garnered from fleetctl
2015-04-13 10:06:27 -04:00
Erinn Looney-Triggs
a3b35ed1a6 Small change for FreeIPA < 4.0 compatibility. 2015-04-08 20:33:38 -06:00
John Galt
72457e4326 Fixed typo 2015-04-07 12:19:37 -04:00
Johannes 'fish' Ziemke
c7f3362795 Replace - in ec2 inventory as well
Dash (-) is not a variable ansible group name, so it needs to be replaced as well.
2015-04-06 14:43:39 +02:00
joefis
3a70affb9a Vagrant inventory: exit 0 on success
Current code has sys.exit(1) at the end of the codepath for the
options --help, --list and --host. These are not error conditions
so should be returning 0 for success, not 1 which is EPERM i.e.
"Operation not permitted". Newer Vagrant versions examine the exit
codes from subprocesses and interpret this as a failure.
2015-03-30 16:39:09 +01:00
Kim Johansson
576832e4c9 Always define error before using it
When the error reason is "Forbidden", the code throws a Python exception
rather than simply outputting the exception reason.

It's not nice to throw a Python exception when all the info to display
a proper message is available.
2015-03-27 10:46:01 +01:00
deimosfr
7b63a57993 fix consul inventory issue (missing method param) 2015-03-26 21:40:36 +01:00
Steve Gargan
ada2567dfb log errors and explicitly exit rather than raising exceptions 2015-03-16 20:00:18 +00:00
Steve Gargan
fbff0449ce fix for issue #10422. outputs informative error message when AWS credentials are not available 2015-03-15 12:24:42 +00:00
Monty Taylor
57c81dfcf7 Add documentation for the new OpenStack Inventory 2015-02-26 12:01:27 -05:00
Brian Coca
8be8a7e2f5 Merge pull request #10277 from dago/solaris
Add Solaris zone support for inventory and connection

NOTE: the connection plugin will need some work for v2 (after 1.9 gets released)
2015-02-19 13:13:31 -05:00
Brian Coca
0912781357 Merge pull request #9421 from emonty/features/new-openstack
Add support for new OpenStack modules
2015-02-12 10:26:12 -05:00
Monty Taylor
3188f7f1c1 Add new OpenStack Inventory module
This inventory module is based on the shade library like the new os_
modules. It shares the ability to configure itself from os-client-config
configuration files or from the standard OS_ environment variables.

More importantly the guts of the code to get the server vars is now
shared with os_compute_facts. This means that playbooks that provision
compute hosts and then want to run plays on them can refer to server
variables in exactly the same way whether the provsioning play ran first
or whether the play ran in the context of a pre-existing inventory.
2015-02-11 19:13:31 -05:00
Brian Coca
788889225d Merge pull request #10078 from sgargan/consul
Ansible support for Consul
2015-02-11 13:58:15 -05:00
Dagobert Michelsen
9cf8c3a901 Add support for Solaris zones 2015-02-11 16:48:04 +01:00
Brian Coca
bbe19f8ed2 Merge pull request #10212 from cchurch/vmware_inventory_improvements
VMware inventory script updates from Tower.
2015-02-11 08:47:51 -05:00
Chris Church
48a0b6fb12 VMware inventory script updates from Tower. 2015-02-11 03:06:27 -05:00
Chris Church
05bb31450b Update EC2 inventory script with changes from Tower.
- Adds to changes from #6676 to support nested VPC group and VPC grouping for RDS.

- Adds to changes from #8822 to ignore invalid instance filters.

- Implements grouping by AMI ID based on #7573.

- Implements configuration options to limit which groups are created automatically, based on #7573.
2015-02-11 01:47:37 -05:00