7957: Update Software Collections instructions in install guide.

* Document the process we currently follow on CentOS 6.
* Add a reference for RHEL instructions.
* Move noteboxes up, so people can follow the instructions
  linearly ("enable Software Collections, then install the packages").

diff --git a/doc/_includes/_note_python27_sc.liquid b/doc/_includes/_note_python27_sc.liquid
index 7aad69531d4c36f1295af3285468e3085ff52acf..08e71f595b2e07bd880e45fae4eab1efdbfa12e8 100644 (file)
--- a/doc/_includes/_note_python27_sc.liquid
+++ b/doc/_includes/_note_python27_sc.liquid
@@ -1,5 +1,14 @@
 {% include 'notebox_begin' %}
 
-On older Red Hat-based systems, these packages require the "python27 Software Collection":https://www.softwarecollections.org/en/scls/rhscl/python27/.
+On older Red Hat-based systems, these packages require the python27 Software Collection.  The Software Collection will be installed automatically as long as Software Collections are enabled on your system.
+
+To "enable Software Collections on CentOS":https://wiki.centos.org/AdditionalResources/Repositories/SCL, run:
+
+<notextile>
+<pre><code>~$ <span class="userinput">sudo yum install centos-release-SCL scl-utils</span>
+</code></pre>
+</notextile>
+
+To enable Software Collections on RHEL, "follow section 2.1 of Red Hat's Installation chapter":https://access.redhat.com/documentation/en-US/Red_Hat_Software_Collections/2/html/2.0_Release_Notes/chap-Installation.html.
 
 {% include 'notebox_end' %}

diff --git a/doc/install/install-compute-node.html.textile.liquid b/doc/install/install-compute-node.html.textile.liquid
index aa4f37d639704f33dc10b2f9e71db1c36a6c129a..7d13f773a628c34db47fe5d9ba7f8b54e47eabfd 100644 (file)
--- a/doc/install/install-compute-node.html.textile.liquid
+++ b/doc/install/install-compute-node.html.textile.liquid
@@ -8,6 +8,8 @@ h2. Install dependencies
 
 First, "add the appropriate package repository for your distribution":{{ site.baseurl }}/install/install-manual-prerequisites.html#repos.
 
+{% include 'note_python27_sc' %}
+
 On Debian-based systems:
 
 <notextile>
@@ -22,8 +24,6 @@ On Red Hat-based systems:
 </code></pre>
 </notextile>
 
-{% include 'note_python27_sc' %}
-
 h2. Install Docker
 
 Compute nodes must have Docker installed to run jobs inside containers.  This requires a relatively recent version of Linux (at least upstream version 3.10, or a distribution version with the appropriate patches backported).  Follow the "Docker Engine installation documentation":https://docs.docker.com/ for your distribution.

diff --git a/doc/install/install-shell-server.html.textile.liquid b/doc/install/install-shell-server.html.textile.liquid
index 08ac57f5ba474a131381fb2d34460f051eda8a2e..ec4c9d46cc8ee7c98a097baa3ddad49f55bd760c 100644 (file)
--- a/doc/install/install-shell-server.html.textile.liquid
+++ b/doc/install/install-shell-server.html.textile.liquid
@@ -28,6 +28,8 @@ If you're not using RVM:
 
 h2. Install the Python SDK and utilities
 
+{% include 'note_python27_sc' %}
+
 On Debian-based systems:
 
 <notextile>
@@ -42,8 +44,6 @@ On Red Hat-based systems:
 </code></pre>
 </notextile>
 
-{% include 'note_python27_sc' %}
-
 h2. Install Git and curl
 
 {% include 'install_git_curl' %}

diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index f82a5b031d298989d3fd59c935198f2b4b962f51..9e8cb7f2ad06d40a84f743fd6e48746f106749a2 100644 (file)
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -16,6 +16,8 @@ h2(#install_workbench). Install Workbench and dependencies
 
 Workbench doesn't need its own database, so it does not need to have PostgreSQL installed.
 
+{% include 'note_python27_sc' %}
+
 On a Debian-based system, install the following packages:
 
 <notextile>
@@ -30,8 +32,6 @@ On a Red Hat-based system, install the following packages:
 </code></pre>
 </notextile>
 
-{% include 'note_python27_sc' %}
-
 h2. Set up configuration files
 
 The Workbench server package uses configuration files that you write to @/etc/arvados/workbench@ and ensures they're consistently deployed.  Create this directory and copy the example configuration files to it:
@@ -95,7 +95,7 @@ For best performance, we recommend you use Nginx as your Web server front-end, w
 <ol>
 <li><a href="https://www.phusionpassenger.com/library/walkthroughs/deploy/ruby/ownserver/nginx/oss/install_passenger_main.html">Install Nginx and Phusion Passenger</a>.</li>
 
-<li>If you're deploying on CentOS and using the python27 Software Collection, configure Nginx to use it:
+<li>If you're deploying on an older Red Hat-based distribution and installed Pythyon 2.7 from Software Collections, configure Nginx to use it:
 
 <pre><code>~$ <span class="userinput">sudo usermod --shell /bin/bash nginx</span>
 ~$ <span class="userinput">sudo -u nginx sh -c 'echo "[[ -z \$PS1 && -e /opt/rh/python27/enable ]] && source /opt/rh/python27/enable" >>~/.bash_profile'</span>

diff --git a/doc/sdk/python/sdk-python.html.textile.liquid b/doc/sdk/python/sdk-python.html.textile.liquid
index 75769d7e2a9f1c0c09b17994992be34ab396f713..b86a7fb40a1f1fc532e40cdac6a652907392ae8c 100644 (file)
--- a/doc/sdk/python/sdk-python.html.textile.liquid
+++ b/doc/sdk/python/sdk-python.html.textile.liquid
@@ -24,6 +24,8 @@ h4. Option 1: Install from distribution packages
 
 First, "add the appropriate package repository for your distribution":{{ site.baseurl }}/install/install-manual-prerequisites.html#repos.
 
+{% include 'note_python27_sc' %}
+
 On Debian-based systems:
 
 <notextile>
@@ -38,8 +40,6 @@ On Red Hat-based systems:
 </code></pre>
 </notextile>
 
-{% include 'note_python27_sc' %}
-
 h4. Option 2: Install with pip
 
 Run @pip-2.7 install arvados-python-client@ in an appropriate installation environment, such as a virtualenv.