Matt Ferrante
03fc2714f1
fixed the choices typo got the ec2_asg module
2014-07-10 11:01:19 -04:00
James Cammarata
9289076dc0
Merge branch 'hiciu-fix-7206' into devel
2014-07-10 08:54:30 -05:00
James Cammarata
3e7d91723f
Adding version_added for new vm_hw_version field in vpshere_guest
2014-07-10 08:53:56 -05:00
James Cammarata
87d1cdd035
Merge branch 'fix-7206' of https://github.com/hiciu/ansible into hiciu-fix-7206
2014-07-10 08:19:05 -05:00
James Cammarata
dc89cc5f44
Merge pull request #8079 from Jmainguy/mysql_db_8070
...
Makes ansible fail if login_port is defined and login_host is either not...
2014-07-09 15:49:45 -05:00
Jonathan Mainguy
90f7f82224
Makes ansible fail if login_port is defined and login_host is either not defined, or defined as localhost. This is because if login_host is localhost then MySQLdb will use the socket instead of TCP. This leads to confusion for ansible users as, when a port is defined it gets ignored if login_host is localhost. This is to fix the bug reported by wrosario #8070 . Info on MysqlDb can be read here http://mysql-python.sourceforge.net/MySQLdb.html
2014-07-09 14:38:27 -04:00
James Cammarata
56c94dc834
Merge branch 'mpeters-issue_7848' into devel
2014-07-09 12:36:25 -05:00
Michael DeHaan
caef3a0de2
Merge pull request #8010 from cchurch/ec2_all_instances
...
Add option to return all EC2/RDS instances regardless of state.
2014-07-09 13:32:32 -04:00
James Cammarata
0798f3cda4
Merge branch 'issue_7848' of https://github.com/mpeters/ansible into mpeters-issue_7848
2014-07-09 12:24:06 -05:00
James Cammarata
2efbdd2484
Merge branch 'mpeters-issue_7906' into devel
2014-07-09 12:22:20 -05:00
James Cammarata
26707568c7
Merge branch 'issue_7906' of https://github.com/mpeters/ansible into mpeters-issue_7906
2014-07-09 12:09:40 -05:00
James Cammarata
2c1e58b835
Merge branch 'ericwb-bug/8057' into devel
2014-07-08 14:40:19 -05:00
James Cammarata
06f72ca3b1
Merge branch 'bug/8057' of https://github.com/ericwb/ansible into ericwb-bug/8057
2014-07-08 14:38:35 -05:00
James Cammarata
33cfdc4cbf
Merge branch 'darkk-assert-with-msg' into devel
2014-07-08 14:05:50 -05:00
James Cammarata
b8ac094eaa
Tweak to only show msg on assert failure if set
2014-07-08 14:05:24 -05:00
James Cammarata
16332b8488
Merge branch 'assert-with-msg' of https://github.com/darkk/ansible into darkk-assert-with-msg
2014-07-08 13:56:08 -05:00
Andreas Fleig
30ad859fe0
ini_file: replace lambda with named function
...
Fixes #6876
2014-07-08 10:17:03 -05:00
James Cammarata
0da5996bb5
Merge pull request #8049 from ranjan/dev
...
Provision VM using virtual network.
2014-07-08 10:11:18 -05:00
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
2014-07-08 00:30:40 -07:00
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
```
2014-07-07 19:05:17 +04:00
James Cammarata
366b39cfc1
Merge pull request #8007 from msabramo/nova.py_set_defaults
...
nova.py: Set defaults for OpenStack settings
2014-07-05 00:36:18 -05:00
James Cammarata
1f2a436bbf
Merge pull request #8038 from caphrim007/correct-missing-msg-argument
...
Fix missing msg argument
2014-07-05 00:30:20 -05:00
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
2014-07-05 00:29:12 -05:00
James Cammarata
088552310b
Merge pull request #8023 from btashton/patch-1
...
ansible_ec2_instance-id key incorrect
2014-07-05 00:13:01 -05:00
James Cammarata
1f813ba128
Merge pull request #8022 from psa/vpc-gateway-peering
...
Fix for #7368 breaks peering connections. Unreak them.
2014-07-05 00:08:04 -05:00
James Cammarata
7f8de3a265
Merge pull request #8024 from kcghost/7941
...
removed port from domain name qualification, fixes #7941
2014-07-04 23:15:17 -05:00
James Cammarata
ff04b2b532
Allow empty yaml vars files
...
Fixes #7843
2014-07-04 23:10:32 -05:00
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().
2014-07-04 14:00:15 -05:00
Michael DeHaan
51e014d915
Merge pull request #8012 from cchurch/callback_cleanup
...
Callback plugin cleanup
2014-07-03 19:29:59 -05:00
Michael DeHaan
1a3a3af04c
Merge pull request #8015 from cchurch/test_win_service
...
win_service module updates and tests
2014-07-03 19:29:24 -05:00
Quinn Slack
9190df2aa9
Remove validation of RDS DB instance type names because Amazon frequently adds new ones
2014-07-03 15:57:28 -07:00
Michael DeHaan
c2ac8fda1e
Data from inventory scripts should be able to use nested Jinja2 expressions.
2014-07-03 16:11:14 -04:00
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