summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <brian.coca+git@gmail.com>2015-09-08 09:39:28 -0400
committerBrian Coca <brian.coca+git@gmail.com>2015-09-08 09:39:28 -0400
commit246e602fceb7bcddac7263d942d2a7173f9f815d (patch)
tree225207ec98cf6b4195e757c406f51c8e8a723293
parent91a5d06c213e1e6e1c8ad792e604a49dc61b9f15 (diff)
downloadansible-246e602fceb7bcddac7263d942d2a7173f9f815d.tar.gz
added note on ssh and sftp to managed node intro
-rw-r--r--docsite/rst/intro_installation.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/docsite/rst/intro_installation.rst b/docsite/rst/intro_installation.rst
index 923422ea13..8319bb2532 100644
--- a/docsite/rst/intro_installation.rst
+++ b/docsite/rst/intro_installation.rst
@@ -53,7 +53,7 @@ This includes Red Hat, Debian, CentOS, OS X, any of the BSDs, and so on.
.. note::
As of 2.0 ansible uses a few more file handles to manage it's forks, OS X has a very low setting so if you want to use 15 or more forks
- you'll need to raise the ulimit, like so `sudo launchctl limit maxfiles 1024 2048`. Or just any time you see a "Too many open files" error.
+ you'll need to raise the ulimit, like so ``sudo launchctl limit maxfiles 1024 2048``. Or just any time you see a "Too many open files" error.
.. _managed_node_requirements:
@@ -61,9 +61,10 @@ This includes Red Hat, Debian, CentOS, OS X, any of the BSDs, and so on.
Managed Node Requirements
`````````````````````````
-On the managed nodes, you only need Python 2.4 or later, but if you are running less than Python 2.5 on the remotes, you will also need:
+On the managed nodes, you need a way to communicate, normally ssh. By default this uses sftp, if not available you can switch to scp in ansible.cfg.
+Also you need Python 2.4 or later, but if you are running less than Python 2.5 on the remotes, you will also need:
-* ``python-simplejson``
+* ``python-simplejson``
.. note::