Commit graph

11446 commits

Author SHA1 Message Date
James Cammarata
5764015876 Merge branch 'ec2_nested_groups' of https://github.com/cchurch/ansible into cchurch-ec2_nested_groups
Conflicts:
	plugins/inventory/ec2.py
2014-07-31 13:07:31 -05:00
James Cammarata
c8d67912be Merge branch 'debfx-patch-1' into devel 2014-07-31 11:54:36 -05:00
James Cammarata
9c1a89ff4e Merge branch 'patch-1' of https://github.com/debfx/ansible into debfx-patch-1 2014-07-31 11:41:21 -05:00
James Cammarata
00ce87484b Merge pull request #8363 from greenmoss/devel
Fix Docker image name parsing
2014-07-31 11:27:19 -05:00
James Cammarata
ccc4b00b40 Merge pull request #8045 from trondhindenes/script_configureWinRMforAnsible
Added script for configuring winrm for Ansible
2014-07-31 11:21:21 -05:00
James Cammarata
74068bc50f Merge pull request #8189 from bcoca/vmware_inv_env
vmware inventory fixes and features
2014-07-31 11:16:52 -05:00
James Cammarata
ac67351d0d Merge pull request #8366 from jlaska/azure_fixes
Several azure fixes
2014-07-30 15:31:55 -05:00
James Laska
7288a6095b Several azure fixes
Several azure fixes/improvements, including:
* Improve failure message when python-azure is not installed
* Improve required argument handling
* Fixes a traceback on instance termination when the variable
'deployment' was not set.
* Fixes a traceback (#8298) when creating instances using the newer SDK
2014-07-30 16:28:13 -04:00
Michael DeHaan
19bf388a17 Merge pull request #8353 from gdamjan/ec2-running-return-info
return the most up-to-date info about an instance when starting/stopping it
2014-07-30 16:07:50 -04:00
Michael DeHaan
d727b79314 Merge pull request #8365 from thisdavejohnson/devel
Parameters to disable_rollback are "true" or "false"
2014-07-30 15:53:59 -04:00
Dave Johnson
76c925c22a Parameters to disable_rollback are "true" or "false" 2014-07-30 15:48:30 -04:00
James Cammarata
7a5076c8b8 Catching shlex splitting error in fact gathering get_cmdline call
Fixes #8352
2014-07-30 14:47:50 -05:00
James Cammarata
80df2135e9 Fix parsing of tasks with variable module names
Also adding an integration test for same.
2014-07-30 14:18:06 -05:00
Kurt Yoder
8ee6906885 Fix Docker image name parsing
Fixes #8357
2014-07-30 14:33:01 -04:00
James Cammarata
189824dd76 Remove whitespace around args
Fixes #8343
2014-07-30 08:51:27 -05:00
Damjan Georgievski
16e5b1b9e6 return the most up-to-date info about an instance when starting/stopping it
otherwise the module will return the info about the instance that it got prior to the action taken
So if you had a task to start an instance:

      ec2:
         instance_ids: ...
         state: running
      register: ec2_info

the registered data would have empty public_dns_name, public_ip, private_dns_name, private_ip
2014-07-30 15:15:49 +02:00
Michael DeHaan
f61ba3d047 Merge pull request #8283 from ps-jay/sys_mount_fstype_doc
Add fstype arg to the mount examples
2014-07-30 08:28:59 -04:00
James Cammarata
b3d441d2c9 Merge branch 'wrosario-integration_mysql_user' into devel 2014-07-29 15:58:18 -05:00
James Cammarata
730e23fa07 Merge branch 'integration_mysql_user' of https://github.com/wrosario/ansible into wrosario-integration_mysql_user 2014-07-29 15:55:57 -05:00
James Cammarata
e6fa50a306 Move splitter to module_utils so modules can use it and fix command arg splitting
Fixes #8338
2014-07-29 14:55:16 -05:00
James Cammarata
912674bd2b Merge pull request #8329 from rdolejsi/devel
file: prevent replace failure when overwriting empty directory with hard or soft link on force=yes
2014-07-29 11:58:32 -05:00
Wayne Rosario
eaf4571e42 Adding the following Test Coverage:
Use mysql_user module to create, delete users.
Update user password and ensure new password was updated for the correct user.
Assert user has access to multiple databases
Assert user creation, deleting using different user privilege and ensure privilege work correctly.
2014-07-29 11:49:53 -04:00
James Cammarata
b64a5ff73d Further enhancements for include params tests 2014-07-29 10:43:37 -05:00
James Cammarata
c9bfcf40d3 Adding further integration tests for include params with quotes 2014-07-29 10:03:44 -05:00
RomanDolejsi
fcf7f03398 file: prevent replace failure when overwriting empty directory with hard/link (force=yes) 2014-07-29 10:46:32 +02:00
James Cammarata
a9f0f8e975 Revert "template.py: Handle purposely raised exceptions in lookup()"
This reverts commit 2fda9bc743.
2014-07-28 23:25:37 -05:00
James Cammarata
aee940aaca Reworking _clean_data() to be smarter about replaces
Fixes #8228
2014-07-28 16:50:18 -05:00
James Cammarata
6e814566de Unquote params passed to an include statement
Fixes #8315
2014-07-28 16:35:52 -05:00
Michael DeHaan
106f4ccc01 Revert "Expand variables in configuration files" - I feel I've been here before.
Breaks some test runs.

This reverts commit a9eef029b6.
2014-07-28 17:10:42 -04:00
Michael DeHaan
f948a94f51 Merge pull request #8313 from sivel/issue/8250
Make sure to assign pyrax.cloudservers to cs. Fixes #8250
2014-07-28 15:48:51 -04:00
Michael DeHaan
6300ded89c Merge pull request #8311 from neersighted/wrap_distroversion
Wrap get_distribution_version() in the hostname module
2014-07-28 15:48:18 -04:00
Michael DeHaan
97fa9502aa Merge pull request #8309 from veeti/cfg-vars
Expand variables in configuration files
2014-07-28 15:47:45 -04:00
Matt Martz
571f343e7d Make sure to assign pyrax.cloudservers to cs. Fixes #8250 2014-07-28 12:44:42 -05:00
Michael DeHaan
226dacc7e6 Cleaning up explanation of mount module states. 2014-07-28 12:18:45 -04:00
Bjorn Neergaard
adcdbdf894 Wrap get_distribution_version() in the hostname module
We wrap get_distribution_version() with a new function,
_get_distribution_version(), that returns `0` when the result is a string or
`None`.

This accounts for the case when get_distribution_version() returns a string,
and we try to compare it to a float. We do this in the hostname module instead
of the module snippets because other modules may want the real string
version.module snippets because other modules may want the real string version.
2014-07-28 11:16:30 -05:00
Michael DeHaan
5a2fd5c612 Ignore powershell implementation files with ansible-doc as documentation lives in Python stubs. 2014-07-28 12:13:30 -04:00
Michael DeHaan
b69f096e8a Merge branch 'ufw' of git://github.com/Trozz/ansible into devel 2014-07-28 12:08:29 -04:00
Michael DeHaan
726a1a33e0 Update unarchive example. 2014-07-28 12:07:31 -04:00
Michael DeHaan
f412d341e3 Merge pull request #8200 from geetotes/devel
[Docs] Added another example to demonstrate unarchive module working entirely on a remote machine
2014-07-28 12:04:33 -04:00
Michael DeHaan
c8d3c0c654 Merge pull request #8244 from wrosario/mysql_user_doc
Update mysql_user doc and example
2014-07-28 12:03:15 -04:00
Michael DeHaan
645ab7baff Merge pull request #7950 from mesk41in/devel
Fix unsupported regexp parameter in assemble
2014-07-28 12:01:12 -04:00
Michael DeHaan
fb60e767a7 Taking alternate approach.
Revert "Fix hostname when get_distribution_version() returns a string."

This reverts commit 08f97c0b9d.
2014-07-28 11:35:33 -04:00
Michael DeHaan
8b77aa9843 Merge pull request #7949 from hacosta/apt_key
Check at most 16 characters of the key. Fixes #7936
2014-07-28 11:30:27 -04:00
Michael DeHaan
216f803aa5 Merge pull request #7954 from alimony/patch-3
cron module: Use correct parameter name in error message.
2014-07-28 11:29:05 -04:00
Michael DeHaan
a52cbdbced Merge pull request #8068 from trondhindenes/win_feature_improvements
Updates to the parameters of win_feature
2014-07-28 11:25:41 -04:00
Michael DeHaan
628d828876 Merge pull request #8087 from neersighted/string_version
Fix hostname when get_distribution_version() returns a string.
2014-07-28 11:24:58 -04:00
Michael DeHaan
30e6a659ae Merge pull request #8171 from jbenden/osx-10.10
Support for OS X 10.10 DP3.
2014-07-28 11:08:53 -04:00
Michael DeHaan
20f65f2c79 Merge pull request #8262 from icoloma/patch-1
Bugfix: bulletproof unexpected_error_msg at gce.py
2014-07-28 11:03:54 -04:00
Michael DeHaan
e75964e206 Merge pull request #7969 from dedalusj/devel
Fixed bug with environment path for homebrew_cask
2014-07-28 10:49:04 -04:00
Michael DeHaan
58a23bc6d1 Merge pull request #7968 from bcoca/acl_fix_compare
acl module: now compares permissions correctly
2014-07-28 10:47:38 -04:00