Commit graph

13242 commits

Author SHA1 Message Date
Tongliang Liu
2f3dff95f5 Merge remote-tracking branch 'upstream/devel' into devel
Conflicts:
	library/files/stat

Resolved: Using theirs
2015-02-11 19:01:51 -08:00
Brian Coca
1b4f1e1756 Merge pull request #9555 from bcoca/low_cost_facts
allow fact objects to be instantiated w/o triggering all fact collection
2015-02-11 20:57:40 -05:00
Brian Coca
fd987f5395 Merge pull request #9063 from sivel/extra-vars-adhoc
Allow ansible (ad-hoc) to support --extra-vars
2015-02-11 20:46:37 -05:00
Matt Martz
68358e31fb Allow ansible (ad-hoc) to support --extra-vars also 2015-02-11 19:34:01 -06: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
Toshio Kuratomi
6fe8865885 Return empty string if unable to read from some files during fact gathering so as not to change the values we return 2015-02-11 14:53:53 -08:00
Brian Coca
f05a1085e9 Merge pull request #9249 from tjanez/doc-add_note_about_escaping_with_regex_replace
Added a note about escaping backreferences when using 'regex_replace' filter
2015-02-11 17:47:19 -05:00
Thanos Lefteris
ef11c8ce55 Typo in galaxy.rst 2015-02-11 23:03:45 +02:00
Brian Coca
13d788021f Merge pull request #4820 from mscherer/add_local_config
Add path for user defined plugin
2015-02-11 14:44:07 -05:00
Monty Taylor
9b17918bc9 Add doc fragment for new OpenStack modules 2015-02-11 14:04:59 -05:00
Brian Coca
9fe0b88332 Merge pull request #10220 from sivel/more-rax-tests
More integration tests for rax modules
2015-02-11 14:04:28 -05:00
Monty Taylor
8c7267f9b9 Add support for new OpenStack modules
Incoming cloud config for OpenStack is complex due to plugins and
deployer choices. Rather than having the logic spread all over the
OpenStack modules, centralize it in the module_utils code.
2015-02-11 14:04:27 -05:00
Matt Martz
be6e49dd1f Add tests for rax_cdb_database 2015-02-11 12:59:02 -06:00
Matt Martz
952aa0c2d8 Don't hardcode list of delete functions to loop through 2015-02-11 12:59:02 -06:00
Matt Martz
9485d82eca Add tests for rax_cdb 2015-02-11 12:59:02 -06:00
Matt Martz
29cd7e3fc1 Add tests for rax_identity 2015-02-11 12:59:02 -06:00
Matt Martz
74f4d186cc Add tests for rax_cbs_attachments 2015-02-11 12:59:01 -06:00
Matt Martz
5e00e72f7a Remove unecessary prep tasks 2015-02-11 12:59:01 -06:00
Matt Martz
3ae1014fd3 Add tests for rax_cbs 2015-02-11 12:59:01 -06:00
Matt Martz
f01ae9f509 Add test_rax_network role 2015-02-11 12:59:01 -06:00
Matt Martz
e54c45ee6d Add test_rax_keypair role 2015-02-11 12:59:01 -06:00
Matt Martz
abac45dafc Add test_rax_meta role 2015-02-11 12:59:01 -06:00
Matt Martz
9878ebf0ee Add tests for rax instance_ids with state=absent 2015-02-11 12:59:01 -06:00
Matt Martz
340b845c38 Add test_rax_facts 2015-02-11 12:59:01 -06:00
Matt Martz
dab9c30584 Add some extra vars and create a dependent role prepare_rax_tests 2015-02-11 12:59:01 -06:00
Matt Martz
5a862328f0 Add test_rax_clb_nodes 2015-02-11 12:59:00 -06:00
Matt Martz
b151c7ffac Add some additional output to cleanup_rax.py 2015-02-11 12:59:00 -06:00
Matt Martz
b8e7211661 Update rax_clb tests for fixes in the module 2015-02-11 12:59:00 -06:00
Matt Martz
7ba7e3bd69 Add tests for rax_clb 2015-02-11 12:59:00 -06:00
Brian Coca
788889225d Merge pull request #10078 from sgargan/consul
Ansible support for Consul
2015-02-11 13:58:15 -05:00
Brian Coca
0b8101aec3 Merge pull request #10141 from dresden-weekly/fix_#10051
fixes #10051 as suggested by @aikomastboom
2015-02-11 13:57:04 -05:00
Brian Coca
c966eb5d80 Merge pull request #10015 from bcoca/nicer_json_errors
handle json load errors as ansible error instead of ugly stacktrace
2015-02-11 13:31:25 -05:00
Brian Coca
4b0cc9152d Merge pull request #10215 from NicolasLM/vault-view-umask
Set proper permissions for ansible-vault view
2015-02-11 09:48:07 -05: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
Brian Coca
a76a6ee726 Merge pull request #10211 from cchurch/tower_ec2_inventory
Update EC2 inventory script with changes from Tower.
2015-02-11 08:34:32 -05:00
Nicolas Le Manchet
faa2449f55 Set proper permissions for ansible-vault view 2015-02-11 14:15:38 +01:00
Toshio Kuratomi
67fb39451a Merge pull request #10210 from pgeraghty/patch-1
Correct typos
2015-02-11 00:18:57 -08:00
Toshio Kuratomi
489cc4ceaa Merge pull request #10213 from ansible/template-symlinks-10208
Clear unwanted parameters from both args and complex args when calling file module
2015-02-11 00:13:45 -08:00
Toshio Kuratomi
10df1b898c Fix template module broken when modifying symlinks
Needed to clear unwanted parameters from both args and complex args when
calling file module.

Fixes #10208
2015-02-11 00:10:37 -08: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
Paul Geraghty
0d82b846cc Correct typos 2015-02-11 02:24:12 +00:00
Toshio Kuratomi
c31831f028 Move from using inspect to __file__ in order to find the path to the
module snippets
2015-02-10 14:41:15 -08:00
Toshio Kuratomi
01a6081b49 First swing at making module_common.py more v2-ish 2015-02-10 12:36:23 -08:00
James Cammarata
0e834509c8 Fix in v2 for bare variable conversion 2015-02-10 11:28:04 -06:00
Brian Coca
38b0a6ae87 Merge pull request #10202 from kstrauser/devel
Adds Kerberos authentication to winrm if available
2015-02-10 10:48:03 -05:00
Kirk Strauser
ab33a0e666 Adds Kerberos authentication to winrm if available
If the `kerberos` module is available, winrm will attempt to establish a
Kerberized connection to a Windows server. This allows use of Windows
domain accounts, which are quite often the only kinds of accounts
enabled on enterprise networks.

This also pulls the `transport_schemes` variable up into the
`winrm.Connection` class. This lets tests or future modifications alter
the list of available schemas without reaching into `Connection.__init__`.
2015-02-10 07:39:07 -08:00
Brian Coca
349b34109b Merge pull request #10138 from bcoca/vbox_inv
initial draft virtualbox inventory script
2015-02-10 10:07:43 -05:00
Brian Coca
416a4c3342 Merge pull request #10199 from bcoca/su_ssh_fix
fixes su/ssh with null prompt
2015-02-10 09:49:35 -05:00
Brian Coca
100dd7f429 renamed to syslog_json 2015-02-10 09:50:39 -05:00