20889: Allows configurable S3 bucket name and IAM profile for Keep backend.

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

diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
index 29d414cf5ca380f7c50463fcb46c121c77b19847..5fe2c0a6e9c53e11ee2d2cc8678ab0db0a31dce1 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
@@ -146,8 +146,8 @@ arvados:
         Replication: 2
         Driver: S3
         DriverParameters:
-          Bucket: __CLUSTER__-nyw5e-000000000000000-volume
-          IAMRole: __CLUSTER__-keepstore-00-iam-role
+          Bucket: __KEEP_AWS_S3_BUCKET__
+          IAMRole: __KEEP_AWS_IAM_ROLE__
           Region: __KEEP_AWS_REGION__
 
     Users:

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index 1fc38fca4b29ad1cd6e67fdf52bc35eb9c2bb6e6..63a51f77312668acff9790a284ea6bae9b7f9152 100644 (file)
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -53,8 +53,10 @@ COMPUTE_SUBNET="subnet_fixme_or_this_wont_work"
 COMPUTE_AWS_REGION="${AWS_REGION}"
 COMPUTE_USER="${DEPLOY_USER}"
 
-# Keep S3 backend region
+# Keep S3 backend settings
 KEEP_AWS_REGION="${AWS_REGION}"
+KEEP_AWS_S3_BUCKET="${CLUSTER}-nyw5e-000000000000000-volume"
+KEEP_AWS_IAM_ROLE="${CLUSTER}-keepstore-00-iam-role"
 
 # If you going to provide your own certificates for Arvados, the provision script can
 # help you deploy them. In order to do that, you need to set `SSL_MODE=bring-your-own` above,

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index b2c5d71928439b199e25848e4c2df93e4a4cf166..e76d3cc6baddf7332c210db03ed3129e600b8c04 100755 (executable)
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -222,6 +222,8 @@ apply_var_substitutions() {
        s#__COMPUTE_SUBNET__#${COMPUTE_SUBNET:-}#g;
        s#__COMPUTE_AWS_REGION__#${COMPUTE_AWS_REGION:-}#g;
        s#__COMPUTE_USER__#${COMPUTE_USER:-}#g;
+       s#__KEEP_AWS_S3_BUCKET__#${KEEP_AWS_S3_BUCKET:-}#g;
+       s#__KEEP_AWS_IAM_ROLE__#${KEEP_AWS_IAM_ROLE:-}#g;
        s#__KEEP_AWS_REGION__#${KEEP_AWS_REGION:-}#g" \
   "${SRCFILE}" > "${DSTFILE}"
 }