From 2c350c49f4cf8243f39cbc7bef0e5d5356891a66 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 1 Dec 2022 11:40:30 -0500
Subject: [PATCH] 19215: Move the note about installing Terraform CLI

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---
 doc/_includes/_download_installer.liquid        | 2 ++
 doc/install/salt-multi-host.html.textile.liquid | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/_includes/_download_installer.liquid b/doc/_includes/_download_installer.liquid
index 31c3f4362e..7d401bb8f2 100644
--- a/doc/_includes/_download_installer.liquid
+++ b/doc/_includes/_download_installer.liquid
@@ -28,6 +28,8 @@ Important!  Once you have initialized the installer directory, all further comma
 
 h3. Using Terraform (AWS specific)
 
+If you are going to use Terraform to set up the infrastructure on AWS, you first need to install the "Terraform CLI":https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli tool installed on your computer, as well as the "AWS CLI":https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html tool.  Then you can initialize the installer.
+
 <notextile>
 <pre><code>CLUSTER=xarv1
 ./installer.sh initialize ~/setup-arvados-${CLUSTER} {{local_params_src}} {{config_examples_src}} {{terraform_src}}
diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 98f69da4aa..8c52635e36 100644
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -65,10 +65,6 @@ In the default configuration these are:
 
 For more information, see "DNS entries and TLS certificates":install-manual-prerequisites.html#dnstls.
 
-h3. Install Terraform and AWS CLI (AWS specific)
-
-If you are going to use Terraform to set up the infrastructure on AWS, you will need to install the "Terraform CLI":https://developer.hashicorp.com/terraform/tutorials/aws-get-started/install-cli tool installed on your computer, as well as the "AWS CLI":https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html tool.
-
 h2(#download). Download the installer
 
 {% assign local_params_src = 'multiple_hosts' %}
-- 
2.30.2