21572: Support modules in Red Hat package setup

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/doc/_includes/_setup_redhat_repo.liquid b/doc/_includes/_setup_redhat_repo.liquid
index d83490d48d55adf91703f3056e066925b26a0118..8fd82e88a69bab1707008d0dfc63a5e6a4a01aec 100644 (file)
--- a/doc/_includes/_setup_redhat_repo.liquid
+++ b/doc/_includes/_setup_redhat_repo.liquid
@@ -3,9 +3,17 @@ Copyright (C) The Arvados Authors. All rights reserved.
 
 SPDX-License-Identifier: CC-BY-SA-3.0
 
 
 SPDX-License-Identifier: CC-BY-SA-3.0
 

-packages_to_install may be a space-separated string
+modules_to_enable and packages_to_install may be space-separated strings

 {% endcomment %}
 
 {% endcomment %}
 

+{%- if modules_to_enable != nil %}
+{% include 'notebox_begin_warning' %}
+
+Arvados tools require newer language runtimes than the default versions included with these distributions. These instructions will **upgrade language runtimes for the entire system**. Check that won't interfere with any existing software before you proceed.
+
+{% include 'notebox_end' %}
+{% endif -%}
+

 Set up the Arvados package repository
 {%- if packages_to_install == nil %}
 {%- elsif packages_to_install contains " " %} and install the packages
 Set up the Arvados package repository
 {%- if packages_to_install == nil %}
 {%- elsif packages_to_install contains " " %} and install the packages


@@ -20,7 +28,10 @@ baseurl=http://rpm.arvados.org/CentOS/$releasever/os/$basearch/
 gpgcheck=1
 gpgkey=http://rpm.arvados.org/CentOS/RPM-GPG-KEY-arvados
 EOF</span>
 gpgcheck=1
 gpgkey=http://rpm.arvados.org/CentOS/RPM-GPG-KEY-arvados
 EOF</span>

-{%- if packages_to_install != nil %}
+{%- if modules_to_enable != nil %}
+# <span class="userinput">dnf module enable {{ modules_to_enable }}</span>
+{% endif -%}
+{%- if packages_to_install != nil -%}

 # <span class="userinput">dnf install {{ packages_to_install }}</span>
 {% endif -%}
 </code></pre>
 # <span class="userinput">dnf install {{ packages_to_install }}</span>
 {% endif -%}
 </code></pre>