Commit Graph

11133 Commits (0798f3cda4d29d2f8c4d03ae068ff03aaf6863f4)
 

Author SHA1 Message Date
James Cammarata 0798f3cda4 Merge branch 'issue_7848' of https://github.com/mpeters/ansible into mpeters-issue_7848 11 years ago
James Cammarata 2efbdd2484 Merge branch 'mpeters-issue_7906' into devel 11 years ago
James Cammarata 26707568c7 Merge branch 'issue_7906' of https://github.com/mpeters/ansible into mpeters-issue_7906 11 years ago
James Cammarata 2c1e58b835 Merge branch 'ericwb-bug/8057' into devel 11 years ago
James Cammarata 06f72ca3b1 Merge branch 'bug/8057' of https://github.com/ericwb/ansible into ericwb-bug/8057 11 years ago
James Cammarata 33cfdc4cbf Merge branch 'darkk-assert-with-msg' into devel 11 years ago
James Cammarata b8ac094eaa Tweak to only show msg on assert failure if set 11 years ago
James Cammarata 16332b8488 Merge branch 'assert-with-msg' of https://github.com/darkk/ansible into darkk-assert-with-msg 11 years ago
Andreas Fleig 30ad859fe0 ini_file: replace lambda with named function
Fixes #6876
11 years ago
James Cammarata 0da5996bb5 Merge pull request #8049 from ranjan/dev
Provision VM using virtual network.
11 years ago
Eric Brown cdedb0f817 Adds an option to specify the glance endpoint type
Some environments that utilize an SSL terminator with a self-signed
certificate can use the publicURL without getting certificate
verify errors.  This allows using the internalURL with in my case
is HTTP and not HTTPS.

Closes issue: #8057
11 years ago
Leonid Evdokimov d94395f48c assert: add optional `msg` argument
Sample playbook when it may be useful:
```
- uri: return_content=yes url={{ api_base }}/action/{{ inventory_hostname }}
  register: output
- assert:
    msg: '{{ output.json | to_nice_json }}'
    that:
      - output.json.foo != "bar"
      - output.json.boo == 42
```
11 years ago
James Cammarata 366b39cfc1 Merge pull request #8007 from msabramo/nova.py_set_defaults
nova.py: Set defaults for OpenStack settings
11 years ago
James Cammarata 1f2a436bbf Merge pull request #8038 from caphrim007/correct-missing-msg-argument
Fix missing msg argument
11 years ago
James Cammarata ec16b18bab Merge pull request #8036 from sqs/remove-fragile-RDS-instance-type-validation
Remove validation of RDS DB instance type names because Amazon frequently adds new ones
11 years ago
James Cammarata 088552310b Merge pull request #8023 from btashton/patch-1
ansible_ec2_instance-id key incorrect
11 years ago
James Cammarata 1f813ba128 Merge pull request #8022 from psa/vpc-gateway-peering
Fix for #7368 breaks peering connections. Unreak them.
11 years ago
James Cammarata 7f8de3a265 Merge pull request #8024 from kcghost/7941
removed port from domain name qualification, fixes #7941
11 years ago
James Cammarata ff04b2b532 Allow empty yaml vars files
Fixes #7843
11 years ago
Tim Rupp 4a871f496a Fix missing msg argument
The following patch adds a missing 'msg=' syntax. An exception is raised
in ansible if this block is reached during the execution of the module

    TypeError: fail_json() takes exactly 1 argument (2 given)

With the 'msg=' added, you get a more informative error. For example

    msg: No settings provided to update_domain().
11 years ago
Michael DeHaan 51e014d915 Merge pull request #8012 from cchurch/callback_cleanup
Callback plugin cleanup
11 years ago
Michael DeHaan 1a3a3af04c Merge pull request #8015 from cchurch/test_win_service
win_service module updates and tests
11 years ago
Quinn Slack 9190df2aa9 Remove validation of RDS DB instance type names because Amazon frequently adds new ones 11 years ago
Michael DeHaan c2ac8fda1e Data from inventory scripts should be able to use nested Jinja2 expressions. 11 years ago
Michael DeHaan 1e05688b04 Merge pull request #8026 from hfinucane/jinja-args
Support a whitelisted subset of jinja2 template options
11 years ago
Ranjan Kumar ac252ea731 Provision VM using virtual network. 11 years ago
Henry Finucane de64bbdc5f Support a whitelisted subset of jinja2 template options 11 years ago
Casey Fitzpatrick 7115cb1f37 removed port from domain name qualification, fixes 7941 11 years ago
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'
11 years ago
Paul Armstrong 97b3e8c6e4 Fix for #7368 breaks peering connections. Unreak them. 11 years ago
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.
11 years ago
James Cammarata 81f35323e9 Revert "Fix get_distribution() for platforms that may have spaces"
This reverts commit 2493020d9f.
11 years ago
James Cammarata 0ee28c1a0e Make sure subnets and route_tables are initialized before using
Fixes #7712
11 years ago
Chris Church 12a0f4abd8 Add integration tests for win_service module. 11 years ago
Chris Church efc07cf627 Return service name, display name, start mode and state from win_service module. 11 years ago
James Cammarata 67e56853d3 Merge pull request #7996 from msabramo/nova.py_JSON_indented_and_sorted
nova.py: indented and sorted JSON output
11 years ago
James Cammarata 27b1d05e4b Merge pull request #7995 from adamnbowen/patch-3
Correct typo: 'receords' -> 'records'
11 years ago
James Cammarata 6524809aeb Merge pull request #7994 from adamnbowen/patch-2
Correct typo: 'additioanl' -> 'additional'
11 years ago
James Cammarata 3613cb0ce5 Merge pull request #7993 from msabramo/nova.py_Remove_documentation_block
nova.py: Remove DOCUMENTATION block
11 years ago
Chris Church afbc7f8a0f Change parameter from pattern to name for playbook_on_play_start in example callback plugins. 11 years ago
Chris Church 955dadf743 Remove runner_on_error callback that is never used. 11 years ago
Chris Church 4e98e3785a Reset play attribute on callback plugins when a play fails. 11 years ago
Chris Church 30fae95efe Change variable from pattern to name to correctly indicate what is being passed to the callback. 11 years ago
James Cammarata f5122b8bfc CHANGELOG and other updates for 1.6.6 release 11 years ago
James Cammarata 8ed6350e65 When parsing json from untrusted sources, remove templating tags 11 years ago
James Cammarata eeb597360e Further safe_eval fixes 11 years ago
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}
```
11 years ago
Marc Abramowitz 26cc0b3780 nova.py: indented and sorted JSON output 11 years ago
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 ;)
11 years ago
Adam Bowen 0c3d7f1bd8 Correct typo: 'additioanl' -> 'additional' 11 years ago