From 6f426f7986058ed188588ddad99fb8c2ab441bf0 Mon Sep 17 00:00:00 2001 From: Tim Gerla Date: Tue, 18 Jun 2013 12:12:37 -0700 Subject: [PATCH 1/2] Explicitly mention the Linux requirement for the Ansible machine, and remove a vestigial heading. --- docsite/latest/rst/gettingstarted.rst | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/docsite/latest/rst/gettingstarted.rst b/docsite/latest/rst/gettingstarted.rst index 34241673c93..940c968d264 100644 --- a/docsite/latest/rst/gettingstarted.rst +++ b/docsite/latest/rst/gettingstarted.rst @@ -10,8 +10,7 @@ Requirements Requirements for Ansible are extremely minimal. -On the central Ansible machine, you will need Python 2.6+. If you are running Python 2.5 on an "Enterprise Linux" variant, we'll show you how to add -2.6 to your distribution. +For the central Ansible machine, you will need a Linux environment with Python 2.6 or greater installed. If you are running Python 2.5 on an "Enterprise Linux" variant, we'll show you how to add 2.6 to your distribution. You will also want the following Python modules (installed via pip or perhaps via your OS package manager via slightly different names): @@ -19,7 +18,7 @@ You will also want the following Python modules (installed via pip or perhaps vi * ``PyYAML`` * ``jinja2`` -If you are using RHEL or CentOS 5 , python is version 2.4 by default, but you can get python 2.6 installed easily. `Use EPEL `_ and install these dependencies as follows: +If you are using RHEL or CentOS 5, Python is version 2.4 by default, but you can get Python 2.6 installed easily. `Use EPEL `_ and install these dependencies as follows: .. code-block:: bash @@ -161,17 +160,6 @@ Make sure you have ``rpm-build``, ``make``, and ``python2-devel`` installed. $ make rpm $ sudo rpm -Uvh ~/rpmbuild/ansible-*.noarch.rpm -Python 2.6 EPEL instructions for RHEL and CentOS 5 -`````````````````````````````````````````````````` - -These distributions don't have Python 2.6 by default, but it is easily -installable. - - -.. code-block:: bash - - - Via MacPorts ++++++++++++ From f2cf8d3e67dad5cb542d024db8e29f3689fd6210 Mon Sep 17 00:00:00 2001 From: Tim Gerla Date: Tue, 18 Jun 2013 18:19:36 -0700 Subject: [PATCH 2/2] Fine-tune Ansible control system OS requirements a bit --- docsite/latest/rst/gettingstarted.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docsite/latest/rst/gettingstarted.rst b/docsite/latest/rst/gettingstarted.rst index 940c968d264..38faead0a8e 100644 --- a/docsite/latest/rst/gettingstarted.rst +++ b/docsite/latest/rst/gettingstarted.rst @@ -10,7 +10,7 @@ Requirements Requirements for Ansible are extremely minimal. -For the central Ansible machine, you will need a Linux environment with Python 2.6 or greater installed. If you are running Python 2.5 on an "Enterprise Linux" variant, we'll show you how to add 2.6 to your distribution. +For the central Ansible machine, you will need an environment with Python 2.6 or greater installed. If you are running Python 2.5 on an "Enterprise Linux" variant, we'll show you how to add 2.6 to your distribution. (Windows is not supported as the Ansible control machine.) You will also want the following Python modules (installed via pip or perhaps via your OS package manager via slightly different names):