Fixed issue #154, instance password

Author: rcastley

workshop/aws/ec2/README.md

@@ -37,14 +37,24 @@ The file `terraform.tfvars` is ignored by git and should not be committed to the
 
 The following variables are available. Edit `terraform.tfvars` to reflect what you need.
 
+### Required variables
+
 - `aws_region`: Which region do you want the instances in?
 - `aws_instance_count`: How many instances?
-- `slug`: Workshop name slug that will be used to tag aws resources (keep this short as this forms part of the instance hostname e.g. `acme`)
+- `slug`: Short name/tag, e.g. acme. Used to derive project and hostnames, AWS tags and terraform workspace e.g. `emea-ws`)
+- `instance_password`: Password for the EC2 instance
+
+### Optional variables
+
 - `splunk_access_token`: Observability Access Token
 - `splunk_rum_token`: Observability RUM Token
 - `splunk_realm`: Observability Realm
-- `splunk_presetup`: Provide a preconfigured instance (OTel Collector and Online Boutique deployed with RUM enabled)
-- `splunk_jdk`: Install OpenJDK and Maven on the instance
+- `subnet_count`: How many subnets to create. The default is 2.
+
+### Instance type variables
+
+- `splunk_presetup`: Provide a preconfigured instance (OTel Collector and Online Boutique deployed with RUM enabled). The default is FALSE.
+- `splunk_jdk`: Install OpenJDK and Maven on the instance. The default is FALSE.
 
 ## 6. Create a Terraform plan
 
@@ -58,6 +68,7 @@ terraform apply \
 -input=false
 ```
 
+<!--
 Or you use the provided script `up` to request instances:
 
 Install the prerequisites, e.g. on Mac: `brew install terraform jq pssh`
@@ -69,3 +80,4 @@ Then use the script:
 ```
 
 This will create a terraform workspace `o11y-for-myproject`, request 12 instances and ensure all instances have completed provisioning.
+-->

workshop/aws/ec2/main.tf

@@ -56,9 +56,9 @@ resource "aws_subnet" "o11y_ws_subnets" {
 # }
 
 resource "aws_security_group" "o11y-ws-sg" {
-  name       = "Observability-Workshop-SG"
+  name   = "Observability-Workshop-SG"
   vpc_id = aws_vpc.o11y-ws-vpc.id
-  
+
   ingress {
     from_port   = 22
     to_port     = 22
@@ -175,20 +175,20 @@ resource "aws_route" "o11y-ws-route" {
 
 locals {
   template_vars = {
-    access_token = var.splunk_access_token
-    rum_token    = var.splunk_rum_token
-    realm        = var.splunk_realm
-    presetup     = var.splunk_presetup
-    jdk          = var.splunk_jdk
+    access_token      = var.splunk_access_token
+    rum_token         = var.splunk_rum_token
+    realm             = var.splunk_realm
+    presetup          = var.splunk_presetup
+    jdk               = var.splunk_jdk
+    instance_password = var.instance_password
   }
 }
 
 resource "aws_instance" "observability-instance" {
   count                  = var.aws_instance_count
   ami                    = data.aws_ami.latest-ubuntu.id
   instance_type          = var.aws_instance_type
-  # subnet_id              = aws_subnet.o11y-ws-subnet.id
-  subnet_id              = "${aws_subnet.o11y_ws_subnets.*.id[ count.index % length(aws_subnet.o11y_ws_subnets) ]}"
+  subnet_id              = aws_subnet.o11y_ws_subnets.*.id[count.index % length(aws_subnet.o11y_ws_subnets)]
   vpc_security_group_ids = [aws_security_group.o11y-ws-sg.id]
 
   user_data = templatefile("${path.module}/templates/userdata.yaml", merge(local.template_vars,
@@ -206,7 +206,7 @@ resource "aws_instance" "observability-instance" {
       #Name = "observability-${count.index + 1}"
       Instance = "${lower(var.slug)}-${format("%02d", count.index + 1)}"
       Name     = "${lower(var.slug)}-${format("%02d", count.index + 1)}"
-      Subnet   = "${aws_subnet.o11y_ws_subnets.*.id[ count.index % length(aws_subnet.o11y_ws_subnets) ]}"
+      Subnet   = "${aws_subnet.o11y_ws_subnets.*.id[count.index % length(aws_subnet.o11y_ws_subnets)]}"
     }
   )
 
@@ -219,14 +219,12 @@ resource "aws_instance" "observability-instance" {
   }
 }
 
-
-
 output "instance_details" {
-  value =  formatlist(
-    "%s, %s, %s, %s", 
+  value = formatlist(
+    "%s, %s, %s, %s",
     aws_instance.observability-instance[*].tags["Instance"],
     aws_instance.observability-instance.*.private_ip,
     aws_instance.observability-instance.*.public_ip,
     aws_instance.observability-instance[*].tags["Subnet"]
   )
-}
+}

workshop/aws/ec2/outputs.tf

@@ -9,3 +9,7 @@ output "instance_names" {
 output "public_subnet_ids" {
     value = aws_subnet.o11y_ws_subnets.*.id
 }
+
+output "instance_password" {
+  value = var.instance_password
+}

workshop/aws/ec2/templates/userdata.yaml

@@ -1,6 +1,6 @@
 #cloud-config
 ssh_pwauth: yes
-password: Observability2023!
+password: ${instance_password}
 chpasswd:
   expire: false
 

workshop/aws/ec2/terraform.tfvars.template

@@ -2,6 +2,7 @@
 aws_region = ""
 aws_instance_count = ""
 slug = ""
+instance_password = ""
 
 # required if pre-setup is desired, optional otherwise. See variables.tf and README.md
 splunk_access_token = ""

workshop/aws/ec2/variables.tf

@@ -1,30 +1,30 @@
 variable "cloud_init_print" {
   description = "Show rendered cloud_init output"
-  type  = bool
-  default = false
+  type        = bool
+  default     = false
 }
 
 variable "splunk_presetup" {
   description = "Presetup the instance? (true/false)"
-  type = bool
-  default = false
+  type        = bool
+  default     = false
 }
 
 variable "splunk_jdk" {
   description = "Enabled Java Development environment? (true/false)"
-  type = bool
-  default = false
+  type        = bool
+  default     = false
 }
 
 variable "aws_instance_count" {
   description = "Instance Count (Usually 1)"
-  nullable = false
+  nullable    = false
 }
 
 variable "subnet_count" {
-  description = "Subnet Count (Usually 1 for small workshops, but can be 2 or 3 for larger one, but never 4 and be aware some regions only support 2 due to limited flavor availabiity)"
-  nullable = false
-  default = "2"
+  description = "Subnet Count (Usually 1 for small workshops, but can be 2 or 3 for larger one, but never 4 and be aware some regions only support 2 due to limited flavour availabiity)"
+  nullable    = false
+  default     = "2"
 }
 
 variable "public_subnet_ids" {
@@ -33,11 +33,16 @@ variable "public_subnet_ids" {
 
 variable "aws_region" {
   description = "AWS Region (for example: us-west-2)"
-  nullable = false
+  nullable    = false
 }
 
 variable "slug" {
-  description = "Short name/tag, e.g. acme. Used to derive project and host names, aws tags and terraform workspace."
+  description = "Short name/tag, e.g. acme. Used to derive project and hostnames, AWS tags and terraform workspace"
+}
+
+variable "instance_password" {
+  description = "Password for the EC2 instance"
+  nullable    = false
 }
 
 variable "splunk_access_token" {
@@ -62,7 +67,7 @@ data "aws_ami" "latest-ubuntu" {
 
   filter {
     name   = "name"
-     values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"]
+    values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"]
   }
 
   filter {