add client

Author: you-rgb

deployments/aws/client.tf

@@ -19,7 +19,8 @@ resource "aws_instance" "client" {
   key_name                    = var.key_pair_name
   iam_instance_profile        = aws_iam_instance_profile.ssm_instance_profile.name
   associate_public_ip_address = var.enable_public_ip
-
+  user_data                   = local.user_startup_script_client
+  depends_on                  = [time_sleep.wait_for_nonrealm_nodes]
   lifecycle {
     create_before_destroy = false
     ignore_changes = [
@@ -43,6 +44,7 @@ resource "aws_instance" "client" {
   tags = {
     Name       = "${var.infinia_deployment_name}-cn-${format("%02d", count.index)}"
     Deployment = var.infinia_deployment_name
+    Role       = "client"
   }
 }
 

deployments/aws/locals.tf

@@ -130,3 +130,89 @@ if [ ! -f $LOG_COMPLETE ] ; then
 fi 
 EOT
 }
+
+locals {
+  base_url   = "https://storage.googleapis.com/ddn-redsetup-public/releases/ubuntu/24.04"
+  qatest_url = "${local.base_url}/qatest"
+  arch       = "amd64"
+
+  user_startup_script_client = <<-EOF
+    #!/usr/bin/env bash
+    set -euo pipefail
+    exec > /var/log/red-client-bootstrap.log 2>&1
+    export DEBIAN_FRONTEND=noninteractive
+    export PATH="/usr/local/bin:/usr/bin:/bin:$PATH"
+
+    apt-get update -y
+    apt-get install -y wget curl golang-go ca-certificates unzip
+    install -d -m 0755 /usr/local/bin
+
+    TMP=/tmp/red-client-install
+    mkdir -p "$TMP"
+
+    RED_VERSION="${var.infinia_version}"
+    ARCH="${local.arch}"
+    BASE_URL="${local.base_url}"
+    QATEST_URL="${local.qatest_url}"
+
+    # --- Install the .deb packages (with retry) ---
+    for pkg in red-client-common red-client-tools redcli; do
+      URL="$BASE_URL/$${pkg}_$${RED_VERSION}_$${ARCH}.deb"
+      DEST="$TMP/$${pkg}_$${RED_VERSION}_$${ARCH}.deb"
+      ok_pkg=0
+      for i in $(seq 1 3); do
+        if curl -fL "$URL" -o "$DEST"; then ok_pkg=1; break; fi
+        echo "Retry $i fetching $URL ..." >&2
+        sleep 5
+      done
+      [ "$ok_pkg" -eq 1 ] || { echo "Failed to download $pkg" >&2; exit 1; }
+      apt-get install -y "$DEST" || apt-get -f install -y
+    done
+
+    # --- Install go-s3-tests (binary) (with retry) ---
+    ok_gos3=0
+    for i in $(seq 1 3); do
+      if curl -fL "$QATEST_URL/go-s3-tests" -o /usr/local/bin/go-s3-tests; then
+        chmod 0755 /usr/local/bin/go-s3-tests
+        ok_gos3=1
+        break
+      fi
+      echo "Retry $i fetching go-s3-tests ..." >&2
+      sleep 5
+    done
+    [ "$ok_gos3" -eq 1 ] || { echo "Failed to install go-s3-tests" >&2; exit 1; }
+
+    # --- Install AWS CLI v2 (arch-aware) ---
+    AWS_TMP=/tmp/awscli
+    mkdir -p "$AWS_TMP"
+    case "$(dpkg --print-architecture)" in
+      amd64) AWSCLI_ZIP="awscli-exe-linux-x86_64.zip" ;;
+      arm64) AWSCLI_ZIP="awscli-exe-linux-aarch64.zip" ;;
+      *)     AWSCLI_ZIP="awscli-exe-linux-x86_64.zip" ;;
+    esac
+    ok_aws=0
+    for i in $(seq 1 3); do
+      if curl -fL "https://awscli.amazonaws.com/$AWSCLI_ZIP" -o "$AWS_TMP/awscliv2.zip"; then
+        ok_aws=1
+        break
+      fi
+      echo "Retry $i fetching AWS CLI ..." >&2
+      sleep 5
+    done
+    [ "$ok_aws" -eq 1 ] || { echo "Failed to download AWS CLI" >&2; exit 1; }
+    unzip -o "$AWS_TMP/awscliv2.zip" -d "$AWS_TMP"
+    "$AWS_TMP/aws/install" --update
+    command -v aws >/dev/null || { echo "AWS CLI not found after install" >&2; exit 1; }
+
+    # --- Final verification ---
+    for b in redcli warp-ddn go-s3-tests aws; do
+      if ! command -v "$b" >/dev/null; then
+        echo "ERROR: $b not installed or not on PATH" >&2
+        exit 1
+      fi
+    done
+
+    rm -rf "$TMP" "$AWS_TMP"
+  EOF
+}
+

deployments/aws/main.tf

@@ -53,7 +53,8 @@ resource "aws_instance" "infinia_realm" {
 
 
 resource "time_sleep" "wait_for_realm_node" {
-  create_duration = "10m"
+  depends_on      = [aws_instance.infinia_realm]
+  create_duration = "5m"
 }
 
 
@@ -108,3 +109,7 @@ resource "aws_instance" "infinia_none_realm" {
   }
 }
 
+resource "time_sleep" "wait_for_nonrealm_nodes" {
+  depends_on      = [aws_instance.infinia_none_realm]
+  create_duration = "5m"
+}

deployments/aws/providers.tf

@@ -4,7 +4,7 @@ provider "aws" {
 
 terraform {
   backend "s3" {
-    bucket = "terraform-dev-raid"
+    bucket = "infinia-terraform-state-471441381769"
     key    = "infinia/state.tfstate"
     region = "us-east-1"
   }

deployments/aws/terraform.tfvars

@@ -3,17 +3,18 @@ vpc_id                  = "vpc-0643ea52b06790437"
 security_group_id       = "sg-0514508ec0ae982b9"
 key_pair_name           = "dev-keys"
 infinia_ami_id          = "ami-0051b37276c1aec55"
+client_ami_id           = "ami-0360c520857e3138f"
 subnet_ids              = ["subnet-06c1a6ccde3dec102"]
 infinia_version         = "2.2.60"
 enable_public_ip        = "false"
 root_device_size        = 256
 num_infinia_instances   = "6"
+num_client_instances    = 1
+instance_type_client    = "m7a.2xlarge"
 instance_type_infinia   = "m7a.2xlarge"
 ebs_volume_size         = 128
-infinia_deployment_name = "raidr"
+infinia_deployment_name = "infinia"
 bucket_name             = "terraform-dev-raid"
 ebs_volumes_per_vm      = 4
 use_ebs_volumes         = true
 
-
-