Merge branch 'rsynctake2' into devel

Conflicts:
	CHANGELOG.md

CHANGELOG.md

@@ -11,6 +11,7 @@ Highlighted new features:
 * added changed_when: (expression) which allows overriding whether a result is changed or not, can work with registered expressions.
 * --extra-vars can now take a file as input "-e @filename"
 * external inventory scripts may now return host variables in one pass, which allows them to be much more efficient for large numbers of hosts
+* if --forks exceeds the numbers of hosts, it will be automatically reduced, set forks to 0 and you get "as many forks as I have hosts" out of the box.
 
 New modules:
 
@@ -29,6 +30,7 @@ New modules:
 * packaging: rpm_key -- adds or removes RPM signing keys
 * monitoring: boundary_meter -- adds or removes boundary.com meters
 * net_infrastructure: dnsmadeeasy - manipulate DnsMadeEasy records
+* files: synchronize -- a wrapper around making rsync easy to understand
 
 Misc changes:
 

lib/ansible/runner/__init__.py

@@ -737,7 +737,10 @@ class Runner(object):
 
         # error handling on this seems a little aggressive?
         if result['rc'] != 0:
-            output = 'could not create temporary directory, SSH (%s) exited with result %d' % (cmd, result['rc'])
+            if result['rc'] == 5:
+                output = 'Authentication failure.'
+            else:
+                output = 'Authentication or permission failure.  In some cases, you may have been able to authenticate and did not have permissions on the remote directory. Consider changing the remote temp path in ansible.cfg to a path rooted in "/tmp". Failed command was: %s, exited with result %d' % (cmd, result['rc'])
             if 'stdout' in result and result['stdout'] != '':
                 output = output + ": %s" % result['stdout']
             raise errors.AnsibleError(output)

lib/ansible/runner/action_plugins/synchronize.py

@@ -0,0 +1,85 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# (c) 2012-2013, Timothy Appnel <tim@appnel.com>
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+import os.path
+
+from ansible import utils
+from ansible.runner.return_data import ReturnData
+
+class ActionModule(object):
+
+    def __init__(self, runner):
+        self.runner = runner
+
+    def _process_origin(self, host, path, user):
+
+        if not host in ['127.0.0.1', 'localhost']:
+            return '%s@%s:%s' % (user, host, path)
+        else:
+            return path
+
+    def setup(self, module_name, inject):
+        ''' Always default to localhost as delegate if None defined '''
+        if inject.get('delegate_to') is None:
+            inject['delegate_to'] = '127.0.0.1'
+
+    def run(self, conn, tmp, module_name, module_args, 
+        inject, complex_args=None, **kwargs):
+
+        ''' generates params and passes them on to the rsync module '''
+
+        # load up options
+
+        options = {}
+        if complex_args:
+            options.update(complex_args)
+        options.update(utils.parse_kv(module_args))
+
+        src = options.get('src', None)
+        dest = options.get('dest', None)
+
+        try:
+            options['local_rsync_path'] = inject['ansible_rsync_path']
+        except KeyError:
+            pass
+
+        src_host = inject['delegate_to'] 
+        dest_host = inject.get('ansible_ssh_host', inject['inventory_hostname'])
+        if options.get('mode', 'push') == 'pull':
+            (dest_host, src_host) = (src_host, dest_host)
+        if not dest_host is src_host:
+            user = inject.get('ansible_ssh_user',
+                              self.runner.remote_user)
+            private_key = inject.get('ansible_ssh_private_key_file', self.runner.private_key_file)
+            if not private_key is None:
+                options['private_key'] = private_key
+            src = self._process_origin(src_host, src, user)
+            dest = self._process_origin(dest_host, dest, user)
+
+        options['src'] = src
+        options['dest'] = dest
+        if 'mode' in options:
+            del options['mode']
+
+        # run the synchronize module
+
+        self.runner.module_args = ' '.join(['%s=%s' % (k, v) for (k,
+                v) in options.items()])
+        return self.runner._execute_module(conn, tmp, 'synchronize',
+                self.runner.module_args, inject=inject)
+

library/files/synchronize

@@ -0,0 +1,144 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# (c) 2012-2013, Timothy Appnel <tim@appnel.com>
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+import subprocess
+
+DOCUMENTATION = '''
+---
+module: synchronize
+version_added: "1.3"
+short_description: Uses rsync to make synchronizing file paths in your playbooks quick and easy.
+description:
+    - This is a wrapper around rsync. Of course you could just use the command action to call rsync yourself, but you also have to add a fair number of boilerplate options and host facts. You still may need to call rsync directly via C(command) or C(shell) depending on your use case. The synchronize action is meant to do common things with C(rsync) easily. It does not provide access to the full power of rsync, but does make most invocations easier to follow.
+options:
+  src:
+    description:
+      - Path on the source machine that will be synchronized to the destination; The path can be absolute or relative.
+    required: true
+  dest:
+    description:
+      - Path on the destination machine that will be synchronized from the source; The path can be absolute or relative.
+    required: true
+  mode:
+    description:
+      - Specify the direction of the synchroniztion. In push mode the localhost or delgate is the  source; In pull mode the remote host in context is the source.
+    required: false
+    choices: [ 'push', 'pull' ]
+    default: 'push'
+  verbosity:
+    description:
+      - An integer controlling the amount of information returned during processing. See the C(-v, --verbose) option of the rsync man page for details. If verbosity is not defined or a value of 0 is assumed, the C(--quiet) option is passed and information is supressed.
+    required: false
+    default: 0
+  delete:
+    description:
+      - Delete files that don't exist (after transfer, not before) in the C(src) path.
+    choices: [ 'yes', 'no' ]
+    default: 'no'
+    required: false
+  rsync_path:
+    description:
+      - Specify the rsync command to run on the remote machine. See C(--rsync-path) on the rsync man page.
+    required: false
+author: Timothy Appnel
+'''
+
+EXAMPLES = '''
+# Synchronization of src on the control machien to dest on the remote hosts
+synchronize: src=some/relative/path dest=/some/absolute/path
+
+# Synchronization of two paths both on the control machine
+local_action: synchronize src=some/relative/path dest=/some/absolute/path
+
+# Synchronization of src on the inventory host to the dest on the localhost in
+pull mode
+synchronize: mode=pull src=some/relative/path dest=/some/absolute/path
+
+# Synchronization of src on delegate host to dest on the current inventory host
+synchronize: >
+    src=some/relative/path dest=/some/absolute/path
+    delegate_to: delegate.host
+
+# Synchronize and delete files in dest on the remote host that are not found in src of localhost.
+synchronize: src=some/relative/path dest=/some/absolute/path delete=yes
+
+# Synchronize and return verbose information from the rsync transfer.
+synchronize: src=some/relative/path dest=/some/absolute/path verbosity=1
+
+# Synchronize using an alternate rsync command
+synchronize: src=some/relative/path dest=/some/absolute/path rsync_path="sudo rsync"
+'''
+
+
+def main():
+    module = AnsibleModule(
+        argument_spec = dict(
+            src = dict(required=True),
+            dest = dict(required=True),
+            verbosity = dict(default=0),
+            tmp_dir = dict(default=None),
+            delete = dict(default='no', type='bool'),
+            private_key = dict(default=None),
+            rsync_path = dict(default=None),
+        )
+    )
+
+    source = module.params['src']
+    dest = module.params['dest']
+    verbosity = module.params['verbosity']
+    delete = module.params['delete']
+    private_key = module.params['private_key']
+    rsync_path = module.params['rsync_path']
+    rsync = module.params.get('local_rsync_path', 'rsync')
+    temp = os.path.dirname(os.path.realpath(__file__))
+
+    cmd = '%s --archive --delay-updates --compress' % rsync
+    if verbosity:
+        cmd = '%s -%s' % (cmd, 'v' * int(verbosity))
+    else:
+        cmd = cmd + ' --quiet'
+    if temp:
+        cmd = cmd + ' --temp-dir ' + temp
+    if delete:
+        cmd = cmd + ' --delete-after'
+    if private_key is None:
+        private_key = ''
+    else:
+        private_key = '-i '+ private_key 
+    cmd = cmd + " --rsh '%s %s -o %s'" % ('ssh', private_key,
+                'StrictHostKeyChecking=no')  # need ssh param
+    if rsync_path:
+        cmd = cmd + ' --rsync-path ' + rsync_path
+
+    cmd = ' '.join([cmd, source, dest])
+    cmdstr = cmd
+    cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
+                           stderr=subprocess.PIPE)
+    (out, err) = cmd.communicate()
+    if cmd.returncode:
+        return module.fail_json(msg=err, rc=cmd.returncode, cmd=cmdstr)
+    else:
+        return module.exit_json(changed=True, msg=out,
+                                rc=cmd.returncode, cmd=cmdstr)
+
+
+# include magic from lib/ansible/module_common.py
+#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
+
+main()
+