19215: Adds hardcoded deploy_user output set to "admin".

Debian AMIs have their default non-root user set to "admin", so admins will
need to set up the local.params DEPLOY_USER var accordingly.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 9aa3556e30fd72fee9d3832ce9ec66926c8962f7..e1c777a33275115f5e2c99a52edb919e61bfed4a 100644 (file)
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -86,6 +86,7 @@ Outputs:
 
 arvados_sg_id = "sg-02fa04a2c273166d7"
 cluster_name = "xarv1"
+deploy_user = "admin"
 domain_name = "example.com"
 letsencrypt_iam_access_key_id = "AKIA43MU4DW7K57DBVSD"
 letsencrypt_iam_secret_access_key = <sensitive>

diff --git a/tools/salt-install/terraform/aws/services/outputs.tf b/tools/salt-install/terraform/aws/services/outputs.tf
index 96af4054d538724b2bd9f8b8bb3080419d51caaf..0cfa72d3e649ecc51bf70f356a5ae25ef5900c78 100644 (file)
--- a/tools/salt-install/terraform/aws/services/outputs.tf
+++ b/tools/salt-install/terraform/aws/services/outputs.tf
@@ -46,3 +46,8 @@ output "cluster_name" {
 output "domain_name" {
   value = data.terraform_remote_state.vpc.outputs.domain_name
 }
+
+# Debian AMI's default user
+output "deploy_user" {
+  value = "admin"
+}
\ No newline at end of file