[arvados] updated: 2.1.0-2973-g370014043
git repository hosting
git at public.arvados.org
Mon Dec 5 18:24:59 UTC 2022
Summary of changes:
doc/install/salt-multi-host.html.textile.liquid | 15 +++++----------
tools/salt-install/installer.sh | 3 ++-
2 files changed, 7 insertions(+), 11 deletions(-)
via 370014043b14f655b9a00bf21b776420d0426354 (commit)
via 3d0b46634a3ca6ed74ca0e9912139abf8083946a (commit)
from 2f69ea48b9ca370be4e7aa65b32a7b8aec35d7c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 370014043b14f655b9a00bf21b776420d0426354
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Dec 5 19:24:32 2022 +0100
19215: Adjusts the documentation to reflect recent changes.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/doc/install/salt-multi-host.html.textile.liquid b/doc/install/salt-multi-host.html.textile.liquid
index 8c52635e3..ae76c5b58 100644
--- a/doc/install/salt-multi-host.html.textile.liquid
+++ b/doc/install/salt-multi-host.html.textile.liquid
@@ -116,11 +116,12 @@ Apply complete! Resources: 16 added, 0 changed, 0 destroyed.
Outputs:
arvados_sg_id = "sg-02f999a99973999d7"
+arvados_subnet_id = "subnet-01234567abc"
cluster_name = "xarv1"
+compute_subnet_id = "subnet-abcdef12345"
deploy_user = "admin"
domain_name = "example.com"
letsencrypt_iam_access_key_id = "AKAA43MAAAWAKAADAASD"
-letsencrypt_iam_secret_access_key = <sensitive>
private_ip = {
"controller" = "10.1.1.1"
"keep0" = "10.1.1.3"
@@ -137,15 +138,16 @@ public_ip = {
"shell" = "44.208.155.240"
"workbench" = "52.204.134.136"
}
+region_name = "us-east-1"
route53_dns_ns = tolist([
"ns-1119.awsdns-11.org",
"ns-1812.awsdns-34.co.uk",
"ns-437.awsdns-54.com",
"ns-809.awsdns-37.net",
])
-subnet_id = "subnet-072a999f939989710"
vpc_cidr = "10.1.0.0/16"
vpc_id = "vpc-0999994998399923a"
+letsencrypt_iam_secret_access_key = "XXXXXSECRETACCESSKEYXXXX"
</code></pre>
@@ -171,18 +173,11 @@ If the parent domain is controlled by some other service, follow the guide for t
h4. Other important output parameters
-* Take note of @letsencrypt_iam_access_key_id@ and @letsencrypt_iam_secret_access_key@ for setting up @LE_AWS_*@ variables in @local.params at .
-
-You'll see that the @letsencrypt_iam_secret_access_key@ data is obscured; to retrieve it you'll need to run the following command inside the @services/@ subdirectory:
-
-<pre><code>$ terraform output letsencrypt_iam_secret_access_key
-"FQ3+3lxxOxxUu+Nw+qx3xixxxExxxV9jFC+XxxRl"</code></pre>
-
The certificates will be requested from Let's Encrypt when you run the installer.
* @vpc_cidr@ will be used to set @CLUSTER_INT_CIDR@
-* You'll also need @subnet_id@ and @arvados_sg_id@ to set @DriverParameters.SubnetID@ and @DriverParameters.SecurityGroupIDs@ in @local_config_dir/pillars/arvados.sls@ and when you "create a compute image":#create_a_compute_image.
+* You'll also need @compute_subnet_id@ and @arvados_sg_id@ to set @DriverParameters.SubnetID@ and @DriverParameters.SecurityGroupIDs@ in @local_config_dir/pillars/arvados.sls@ and when you "create a compute image":#create_a_compute_image.
You can now proceed to "edit local.params":#localparams.
commit 3d0b46634a3ca6ed74ca0e9912139abf8083946a
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Dec 5 19:05:09 2022 +0100
19215: Properly outputs LE's secret access key.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh
index eae79c614..0cb4b6e09 100755
--- a/tools/salt-install/installer.sh
+++ b/tools/salt-install/installer.sh
@@ -205,7 +205,8 @@ case "$subcmd" in
logfile=terraform-$(date -Iseconds).log
(cd terraform/vpc && terraform apply) 2>&1 | tee -a $logfile
(cd terraform/data-storage && terraform apply) 2>&1 | tee -a $logfile
- (cd terraform/services && terraform apply) 2>&1 | tee -a $logfile
+ (cd terraform/services && terraform apply) 2>&1 | grep -v letsencrypt_iam_secret_access_key | tee -a $logfile
+ (cd terraform/services && echo -n 'letsencrypt_iam_secret_access_key = ' && terraform output letsencrypt_iam_secret_access_key) 2>&1 | tee -a $logfile
;;
generate-tokens)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list