Adds AWS Instances to Output

instances/instance.tf

@@ -1,11 +1,11 @@
 terraform {
-  required_providers {
-    aws = {
-      source = "hashicorp/aws"
-      version = "5.17.0"
-      configuration_aliases = [ aws.main ]
+    required_providers {
+        aws = {
+            source = "hashicorp/aws"
+            version = "5.17.0"
+            configuration_aliases = [ aws.main ]
+        }
     }
-  }
 }
 
 
@@ -66,9 +66,8 @@ resource "aws_instance" "main" {
 
     key_name = aws_key_pair.ssh_key_main.key_name
 
-    user_data   = templatefile("${path.module}/scripts/setup_main.sh", {
+    user_data   = templatefile("${path.module}/scripts/setup_server.sh", {
         extra_key = aws_key_pair.ssh_key_ci_cd.public_key
-        k3s_token = var.k3s_token
     })
 
     tags = {
@@ -84,10 +83,8 @@ resource "aws_instance" "worker" {
 
     key_name = aws_key_pair.ssh_key_main.key_name
 
-    user_data   = templatefile("${path.module}/scripts/setup_worker.sh", {
+    user_data   = templatefile("${path.module}/scripts/setup_server.sh", {
         extra_key = aws_key_pair.ssh_key_ci_cd.public_key
-        k3s_token = var.k3s_token
-        k3s_cluster_ip = var.project_domain
     })
 
     tags = {
@@ -100,4 +97,12 @@ resource "aws_instance" "worker" {
 
 output "pool_master_public_ip" {
     value = aws_instance.main.public_ip
+}
+
+output "pool_master_instance" {
+    value = aws_instance.main
+}
+
+output "pool_worker_instances" {
+    value = aws_instance.worker
 }

instances/scripts/setup_main.sh

@@ -1,12 +0,0 @@
-#!/bin/bash -xe
-
-
-echo -e "\n${extra_key}" >> /home/ubuntu/.ssh/authorized_keys;
-
-echo -e "export TERM='xterm-256color'" >> /home/ubuntu/.profile;
-
-su ubuntu -i << EOF
-# curl -sfL https://get.k3s.io | \
-#         K3S_TOKEN="${k3s_token}" sh -'
-echo "HERE" >> /home/ubuntu/test.txt
-EOF

instances/scripts/setup_server.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+
+echo -e "\n${extra_key}" >> /home/ubuntu/.ssh/authorized_keys;
+
+echo "export TERM='xterm-256color';" > /home/ubuntu/.profile;
+
+exit 0;

instances/scripts/setup_worker.sh

@@ -1,14 +0,0 @@
-#!/bin/bash -xe
-
-
-echo -e "\n${extra_key}" >> /home/ubuntu/.ssh/authorized_keys;
-
-echo "export TERM='xterm-256color'" > /home/ubuntu/.profile;
-
-su ubuntu -i << EOF
-# curl -sfL https://get.k3s.io | \
-#         INSTALL_K3S_EXEC="agent" \
-#         K3S_TOKEN="${k3s_token}" \
-#         sh -s - --server ${k3s_cluster_ip}
-echo "HERE" >> /home/ubuntu/test.txt
-EOF