[arvados] updated: 2.6.0-145-ga751c4867
git repository hosting
git at public.arvados.org
Wed May 10 18:26:21 UTC 2023
Summary of changes:
tools/salt-install/terraform/aws/services/locals.tf | 2 +-
tools/salt-install/terraform/aws/services/main.tf | 2 +-
tools/salt-install/terraform/aws/services/terraform.tfvars | 7 +++++--
tools/salt-install/terraform/aws/services/variables.tf | 6 ++++++
4 files changed, 13 insertions(+), 4 deletions(-)
via a751c4867db205101be07c357f1b7fec3b3332d8 (commit)
from 536b3faf5d3494bfe7aebc727efb6464b67f367b (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 a751c4867db205101be07c357f1b7fec3b3332d8
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Wed May 10 15:25:47 2023 -0300
20482: Allows the site admin to specify a custom AMI for the nodes.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/tools/salt-install/terraform/aws/services/locals.tf b/tools/salt-install/terraform/aws/services/locals.tf
index d515453cb..73de27780 100644
--- a/tools/salt-install/terraform/aws/services/locals.tf
+++ b/tools/salt-install/terraform/aws/services/locals.tf
@@ -10,10 +10,10 @@ locals {
public_ip = data.terraform_remote_state.vpc.outputs.public_ip
private_ip = data.terraform_remote_state.vpc.outputs.private_ip
pubkey_path = pathexpand(var.pubkey_path)
- pubkey_name = "${local.cluster_name}-arvados-deployer-key"
public_hosts = data.terraform_remote_state.vpc.outputs.public_hosts
private_hosts = data.terraform_remote_state.vpc.outputs.private_hosts
user_facing_hosts = data.terraform_remote_state.vpc.outputs.user_facing_hosts
internal_service_hosts = data.terraform_remote_state.vpc.outputs.internal_service_hosts
ssl_password_secret_name = "${local.cluster_name}-${var.ssl_password_secret_name_suffix}"
+ instance_ami_id = var.instance_ami != "" ? var.instance_ami : data.aws_ami.debian-11.image_id
}
diff --git a/tools/salt-install/terraform/aws/services/main.tf b/tools/salt-install/terraform/aws/services/main.tf
index e4724c92c..c528a1239 100644
--- a/tools/salt-install/terraform/aws/services/main.tf
+++ b/tools/salt-install/terraform/aws/services/main.tf
@@ -41,7 +41,7 @@ resource "aws_iam_instance_profile" "default_instance_profile" {
resource "aws_instance" "arvados_service" {
for_each = toset(concat(local.public_hosts, local.private_hosts))
- ami = data.aws_ami.debian-11.image_id
+ ami = local.instance_ami_id
instance_type = var.default_instance_type
user_data = templatefile("user_data.sh", {
"hostname": each.value,
diff --git a/tools/salt-install/terraform/aws/services/terraform.tfvars b/tools/salt-install/terraform/aws/services/terraform.tfvars
index 7231717ee..4be0edd59 100644
--- a/tools/salt-install/terraform/aws/services/terraform.tfvars
+++ b/tools/salt-install/terraform/aws/services/terraform.tfvars
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: CC-BY-SA-3.0
# Set to a specific SSH public key path. Default: ~/.ssh/id_rsa.pub
-# pubkey_path = /path/to/pub.key
+# pubkey_path = "/path/to/pub.key"
# Set the instance type for your hosts. Default: m5a.large
# default_instance_type = "t2.micro"
@@ -14,4 +14,7 @@
# User for software deployment. Depends on the AMI's distro.
# Default: 'admin'
-# deploy_user = ubuntu
+# deploy_user = "ubuntu"
+
+# Instance AMI to use for service nodes. Default: latest from Debian 11
+# instance_ami = "ami-0481e8ba7f486bd99"
\ No newline at end of file
diff --git a/tools/salt-install/terraform/aws/services/variables.tf b/tools/salt-install/terraform/aws/services/variables.tf
index 4117b7b49..99005a220 100644
--- a/tools/salt-install/terraform/aws/services/variables.tf
+++ b/tools/salt-install/terraform/aws/services/variables.tf
@@ -24,4 +24,10 @@ variable "ssl_password_secret_name_suffix" {
description = "Name suffix for the SSL certificate's private key password AWS secret."
type = string
default = "arvados-ssl-privkey-password"
+}
+
+variable "instance_ami" {
+ description = "The EC2 instance AMI to use on the nodes"
+ type = string
+ default = ""
}
\ No newline at end of file
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list