19215: Fix *_INT_IP defaults and Terraform CLI install text.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/doc/_includes/_download_installer.liquid b/doc/_includes/_download_installer.liquid
index 7d401bb8f268d890da9d4430265e47a069ed8aba..724ed1416ee8f81d62d3c03a8bc908f7f3fc4b3b 100644 (file)
--- a/doc/_includes/_download_installer.liquid
+++ b/doc/_includes/_download_installer.liquid
@@ -28,7 +28,7 @@ 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.
+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 and 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

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index c39351d74f99ef77c2f89ec509e884ce33763058..be94cea4f8ed9c32d2c71b47f0f989cf18b3463c 100644 (file)
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -46,9 +46,9 @@ CLUSTER_INT_CIDR=10.0.0.0/16
 
 # Note the IPs in this example are shared between roles, as suggested in
 # https://doc.arvados.org/main/install/salt-multi-host.html
-CONTROLLER_INT_IP=10.0.0.1
-WEBSOCKET_INT_IP=10.0.0.1
-KEEP_INT_IP=10.0.0.2
+CONTROLLER_INT_IP=10.1.1.1
+WEBSOCKET_INT_IP=10.1.1.1
+KEEP_INT_IP=10.1.1.2
 # Both for collections and downloads
 KEEPWEB_INT_IP=10.1.1.2
 KEEPSTORE0_INT_IP=10.1.1.3