Commit graph

11241 commits

Author SHA1 Message Date
Michael DeHaan
1e05688b04 Merge pull request #8026 from hfinucane/jinja-args
Support a whitelisted subset of jinja2 template options
2014-07-03 07:30:59 -05:00
Ranjan Kumar
ac252ea731 Provision VM using virtual network. 2014-07-03 15:36:51 +05:30
Henry Finucane
de64bbdc5f Support a whitelisted subset of jinja2 template options 2014-07-02 21:14:26 -07:00
Casey Fitzpatrick
7115cb1f37 removed port from domain name qualification, fixes 7941 2014-07-02 19:54:50 -04:00
Brennan Ashton
a9e23cf090 ansible_ec2_instance-id key incorrect
ansible_ec2_instance-id should be ansible_ec2_instance_id

fatal: [*IP*] => One or more undefined variables: 'dict object' has no attribute 'ansible_ec2_instance-id'
2014-07-02 16:21:55 -07:00
Paul Armstrong
97b3e8c6e4 Fix for #7368 breaks peering connections. Unreak them. 2014-07-02 23:13:29 +00:00
James Cammarata
746f52c5aa Merge pull request #7896 from botify-labs/feature/add-instance-monitoring-to-ec2-lc
Adds support for Cloudwatch detailled monitoring in ec2_lc module.
2014-07-02 09:50:27 -05:00
James Cammarata
81f35323e9 Revert "Fix get_distribution() for platforms that may have spaces"
This reverts commit 2493020d9f.
2014-07-02 09:44:44 -05:00
James Cammarata
0ee28c1a0e Make sure subnets and route_tables are initialized before using
Fixes #7712
2014-07-02 09:26:51 -05:00
Chris Church
12a0f4abd8 Add integration tests for win_service module. 2014-07-02 08:12:40 -04:00
Chris Church
efc07cf627 Return service name, display name, start mode and state from win_service module. 2014-07-02 08:12:40 -04:00
James Cammarata
67e56853d3 Merge pull request #7996 from msabramo/nova.py_JSON_indented_and_sorted
nova.py: indented and sorted JSON output
2014-07-01 20:10:49 -05:00
James Cammarata
27b1d05e4b Merge pull request #7995 from adamnbowen/patch-3
Correct typo: 'receords' -> 'records'
2014-07-01 20:09:23 -05:00
James Cammarata
6524809aeb Merge pull request #7994 from adamnbowen/patch-2
Correct typo: 'additioanl' -> 'additional'
2014-07-01 20:08:46 -05:00
James Cammarata
3613cb0ce5 Merge pull request #7993 from msabramo/nova.py_Remove_documentation_block
nova.py: Remove DOCUMENTATION block
2014-07-01 20:07:32 -05:00
Chris Church
afbc7f8a0f Change parameter from pattern to name for playbook_on_play_start in example callback plugins. 2014-07-01 17:06:44 -04:00
Chris Church
955dadf743 Remove runner_on_error callback that is never used. 2014-07-01 17:02:10 -04:00
Chris Church
4e98e3785a Reset play attribute on callback plugins when a play fails. 2014-07-01 17:02:10 -04:00
Chris Church
30fae95efe Change variable from pattern to name to correctly indicate what is being passed to the callback. 2014-07-01 17:02:09 -04:00
James Cammarata
f5122b8bfc CHANGELOG and other updates for 1.6.6 release 2014-07-01 16:00:03 -05:00
Chris Church
7f27c56a79 Add option to return all EC2/RDS instances regardless of state. 2014-07-01 15:50:04 -04:00
Paul Armstrong
d5b6781482 Make resource_tags required and do whitespace cleanup 2014-07-01 12:33:06 -07:00
James Cammarata
8ed6350e65 When parsing json from untrusted sources, remove templating tags 2014-07-01 14:14:14 -05:00
James Cammarata
eeb597360e Further safe_eval fixes 2014-07-01 14:14:14 -05:00
Marc Abramowitz
50ffa9e0e7 nova.py: Set defaults for OpenStack settings
- auth_system
- region_name

These are config settings that could be left out in many scenarios, but
the current code is requiring them. With this in place, I can get by
with this minimal .ini file:

```ini
[openstack]
version=1.1
auth_url=http://{keystone_host}:5000/v2.0
project_id=web
username={username}
api_key={password}
```
2014-07-01 10:05:57 -07:00
Marc Abramowitz
26cc0b3780 nova.py: indented and sorted JSON output 2014-06-30 21:42:21 -07:00
Adam Bowen
c0da5f6bd3 Correct typo: 'receords' -> 'records'
I should read more than a sentence at a time when I'm correcting typos—sorry for the typo correction spam ;)
2014-06-30 21:44:08 -05:00
Adam Bowen
0c3d7f1bd8 Correct typo: 'additioanl' -> 'additional' 2014-06-30 21:42:02 -05:00
Marc Abramowitz
685fae4d9c nova.py: Remove DOCUMENTATION block
@mpdehaan said that nothing uses them at
https://github.com/ansible/ansible/pull/7988#issuecomment-47600006
2014-06-30 16:54:27 -07:00
Michael DeHaan
14cf3c4d2a Merge pull request #7972 from mscherer/fix_lxc
libvirt_lxc: Fix exec_command prototype for the plugin
2014-06-29 14:32:08 -05:00
Michael DeHaan
2d53bc41ed Merge pull request #7981 from adamnbowen/patch-1
Correct typo: 'manaul' to 'manual'
2014-06-29 13:21:43 -05:00
Adam Bowen
61b107da34 Correct typo: 'manaul' to 'manual' 2014-06-29 13:09:41 -05:00
Michael DeHaan
e013043f40 Merge pull request #7974 from msabramo/CODING_GUIDELINES_slash_to_backslash
CODING_GUIDELINES: Fix typo: / => \
2014-06-28 12:36:40 -05:00
Marc Abramowitz
a1af6ca0c6 CODING_GUIDELINES: Fix typo: / => \ 2014-06-28 08:21:15 -07:00
Michael Scherer
f0a7139290 Fix exec_command prototype for the plugin 2014-06-28 13:06:40 +02:00
Michael DeHaan
6fdf77f9fe Update guides.rst 2014-06-27 16:35:27 -04:00
James Cammarata
539426f612 Performance tuning inventory functions for large inventories 2014-06-26 23:15:39 -05:00
James Cammarata
29434b06b8 Merge pull request #7942 from sidred10/devel
Fixed FreeBSD ports install issue
2014-06-26 11:50:33 -05:00
sid
08370b3caf Fixed FreeBSD ports install issue 2014-06-26 20:52:57 +05:30
James Cammarata
5c959e7a20 Merge pull request #7939 from PinGwynn/feature
portage: Successful exit if sync=yes and no package provided
2014-06-26 10:22:07 -05:00
Maxim Odinintsev
82c026387f Successfull exit if sync=yes and no package provided 2014-06-26 15:02:15 +03:00
Maxim Odinintsev
a58912773d Success exit if sync=yes and no package provided 2014-06-26 14:55:16 +03:00
James Cammarata
05eb6aacec Merge pull request #7925 from devpopol/fixes/api_error
fixes the now-incorrect module for ApiError -- noticed since 0.3.2
2014-06-25 22:33:22 -05:00
James Cammarata
2305ac9881 Merge pull request #7930 from trbs/apt_key_fetch_url_failure_codes
apt_key clear message when downloading key returns an (http) error code
2014-06-25 22:27:08 -05:00
James Cammarata
f5a4bd8af6 Backporting packaging updates from 1.6 branch 2014-06-25 22:17:21 -05:00
Michael DeHaan
86481c891d Update CHANGELOG.md 2014-06-25 22:59:48 -04:00
Michael DeHaan
4de8c8ebf0 Update RELEASES.txt 2014-06-25 22:58:37 -04:00
James Cammarata
35368e531b Additional fixes for safe_eval 2014-06-25 21:26:32 -05:00
Michael DeHaan
373fa0f722 Merge pull request #7934 from chrishepner/patch-1
Fix missing code block in playbook variables doc
2014-06-25 17:03:29 -05:00
Michael DeHaan
f6c7e34527 Merge pull request #7931 from quiver/fix-yum-module-doc
In yum module example, use present/absent instead of installed/removed
2014-06-25 17:03:10 -05:00