Update docs to explain how to get Python 2.6 going on EPEL

26fb8eeb · Michael DeHaan · 9177b7f3 · 26fb8eeb · 26fb8eeb · 26fb8eeb
Commit 26fb8eeb authored Apr 25, 2012 by Michael DeHaan
14 changed files
--- a/YAMLSyntax.html
+++ b/YAMLSyntax.html
@@ -247,7 +247,7 @@ languages:
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/api.html
+++ b/api.html
@@ -331,7 +331,7 @@ a conf.d file appropriately or something similar.  Who knows.</p>
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/examples.html
+++ b/examples.html
@@ -343,7 +343,7 @@ a simplified syntax for this.</p>
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/faq.html
+++ b/faq.html
@@ -354,7 +354,7 @@ tasks &#8211; whether for a QA sytem, build system, or anything you can think of
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/genindex.html
+++ b/genindex.html
@@ -162,7 +162,7 @@ s.parentNode.insertBefore(ga, s);
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/gettingstarted.html
+++ b/gettingstarted.html
@@ -130,6 +130,7 @@ s.parentNode.insertBefore(ga, s);
  <span class="localtoc"><ul>
 <li><a class="reference internal" href="#">Downloads &amp; Getting Started</a><ul>
 <li><a class="reference internal" href="#requirements">Requirements</a></li>
+<li><a class="reference internal" href="#python-2-6-epel-instructions-for-rhel-and-centos-5">Python 2.6 EPEL instructions for RHEL and CentOS 5</a></li>
 <li><a class="reference internal" href="#getting-ansible">Getting Ansible</a><ul>
 <li><a class="reference internal" href="#running-from-checkout">Running From Checkout</a></li>
 <li><a class="reference internal" href="#make-install">Make Install</a></li>
@@ -170,25 +171,28 @@ s.parentNode.insertBefore(ga, s);
 <div class="section" id="requirements">
 <h2>Requirements<a class="headerlink" href="#requirements" title="Permalink to this headline">¶</a></h2>
 <p>Requirements for Ansible are extremely minimal.</p>
-<p>If you are running python 2.6 or later on the <strong>overlord</strong> machine (the machine
-that you&#8217;ll be talking to the remote machines from), you will need:</p>
+<p>Ansible is written for Python 2.6.  If you are running Python 2.5 on an &#8220;Enterprise Linux&#8221; variant,
+your distribution can easily install 2.6 (see instructions in the next section).  Newer versions
+of Linux and OS X should already have 2.6.</p>
+<p>In additon to Python 2.6, you will want the following packages:</p>
 <ul class="simple">
 <li><tt class="docutils literal"><span class="pre">paramiko</span></tt></li>
 <li><tt class="docutils literal"><span class="pre">PyYAML</span></tt></li>
-<li><tt class="docutils literal"><span class="pre">python-jinja2</span></tt> (for playbooks)</li>
+<li><tt class="docutils literal"><span class="pre">python-jinja2</span></tt></li>
 </ul>
-<p>If you are only running Python 2.5, you will also need:</p>
+<p>On the managed nodes, you only need Python 2.4 or later, but if you are are running less than Python 2.6 on them, you will
+also need:</p>
 <ul class="simple">
-<li>The Python 2.5 backport of the <tt class="docutils literal"><span class="pre">multiprocessing</span></tt> module (<a class="reference external" href="http://code.google.com/p/python-multiprocessing/wiki/Install">see here</a>)</li>
 <li><tt class="docutils literal"><span class="pre">python-simplejson</span></tt></li>
 </ul>
-<p>If you have any managed-nodes with python older than 2.6, you will also need:</p>
-<ul class="simple">
-<li><tt class="docutils literal"><span class="pre">python-simplejson</span></tt></li>
-</ul>
-<p>On the managed nodes, to use templates, you will also need:</p>
+<p>NOTE: Ansible 0.4 will have ways to remote bootstrap this, using Ansible itself.  Stay tuned.</p>
+</div>
+<div class="section" id="python-2-6-epel-instructions-for-rhel-and-centos-5">
+<h2>Python 2.6 EPEL instructions for RHEL and CentOS 5<a class="headerlink" href="#python-2-6-epel-instructions-for-rhel-and-centos-5" title="Permalink to this headline">¶</a></h2>
+<p>These distributions don&#8217;t have Python 2.6 by default, but it is easily installable.</p>
 <ul class="simple">
-<li><tt class="docutils literal"><span class="pre">python-jinja2</span></tt> (you can easily install this using ansible, and this will not be required in version 0.3 as templates will be evaluated locally)</li>
+<li>If you have not already done so, <a class="reference external" href="http://fedoraproject.org/wiki/EPEL">configure EPEL</a></li>
+<li>yum install python26 python26-PyYAML python26-paramiko python26-jinja2</li>
 </ul>
 </div>
 <div class="section" id="getting-ansible">
@@ -311,7 +315,7 @@ explore, but you already have a fully working infrastructure!</p>
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/index.html
+++ b/index.html
@@ -259,6 +259,7 @@ Email: <input type=text name=email>&nbsp;&nbsp;<input type=submit name="sub" val
 <ul>
 <li class="toctree-l1"><a class="reference internal" href="gettingstarted.html">Downloads &amp; Getting Started</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="gettingstarted.html#requirements">Requirements</a></li>
+<li class="toctree-l2"><a class="reference internal" href="gettingstarted.html#python-2-6-epel-instructions-for-rhel-and-centos-5">Python 2.6 EPEL instructions for RHEL and CentOS 5</a></li>
 <li class="toctree-l2"><a class="reference internal" href="gettingstarted.html#getting-ansible">Getting Ansible</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="gettingstarted.html#running-from-checkout">Running From Checkout</a></li>
 <li class="toctree-l3"><a class="reference internal" href="gettingstarted.html#make-install">Make Install</a></li>
@@ -399,7 +400,7 @@ Puppet Labs, and rPath.  Reach Michael by email <a class="reference external" hr
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/moduledev.html
+++ b/moduledev.html
@@ -396,7 +396,7 @@ Stop by the mailing list to inquire about requirements.</p>
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/modules.html
+++ b/modules.html
@@ -655,7 +655,7 @@ yum pkg=httpd state=installed</pre>
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/patterns.html
+++ b/patterns.html
@@ -291,7 +291,7 @@ style file with a YAML one.:</p>
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/playbooks.html
+++ b/playbooks.html
@@ -674,7 +674,7 @@ Let&#8217;s run a playbook using a parallelism level of 10:</p>
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/rst/gettingstarted.rst
+++ b/rst/gettingstarted.rst
@@ -6,25 +6,30 @@ Requirements

 Requirements for Ansible are extremely minimal.

-If you are running python 2.6 or later on the **overlord** machine (the machine
-that you'll be talking to the remote machines from), you will need:
+Ansible is written for Python 2.6.  If you are running Python 2.5 on an "Enterprise Linux" variant,
+your distribution can easily install 2.6 (see instructions in the next section).  Newer versions
+of Linux and OS X should already have 2.6.
+
+In additon to Python 2.6, you will want the following packages:

 * ``paramiko``
 * ``PyYAML``
-* ``python-jinja2`` (for playbooks)
+* ``python-jinja2``

-If you are only running Python 2.5, you will also need:
+On the managed nodes, you only need Python 2.4 or later, but if you are are running less than Python 2.6 on them, you will
+also need:

-* The Python 2.5 backport of the ``multiprocessing`` module (`see here <http://code.google.com/p/python-multiprocessing/wiki/Install>`_)
-* ``python-simplejson``
+* ``python-simplejson`` 

-If you have any managed-nodes with python older than 2.6, you will also need:
+NOTE: Ansible 0.4 will have ways to remote bootstrap this, using Ansible itself.  Stay tuned.

-* ``python-simplejson``
+Python 2.6 EPEL instructions for RHEL and CentOS 5
+``````````````````````````````````````````````````

-On the managed nodes, to use templates, you will also need:
+These distributions don't have Python 2.6 by default, but it is easily installable.

-* ``python-jinja2`` (you can easily install this using ansible, and this will not be required in version 0.3 as templates will be evaluated locally)
+* If you have not already done so, `configure EPEL <http://fedoraproject.org/wiki/EPEL>`_
+* yum install python26 python26-PyYAML python26-paramiko python26-jinja2

 Getting Ansible
 ```````````````

--- a/search.html
+++ b/search.html
@@ -179,7 +179,7 @@ s.parentNode.insertBefore(ga, s);
    <p class="pull-right"><a href="#">Back to top</a></p>
    <p>
        &copy; Copyright 2012 Michael DeHaan.<br/>
-      Last updated on Apr 22, 2012.<br/>
+      Last updated on Apr 25, 2012.<br/>
      Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.0.8.<br/>
    </p>
  </div>

--- a/searchindex.js
+++ b/searchindex.js