Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated template plugin dependency #67

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove deprecated template plugin dependency #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f91d19c
Remove deprecated template_file plugin dependancy
May 20, 2022
1b3aea3
Fix the ability to provide own user-data_file
May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,6 @@ resource "aws_security_group_rule" "bastion_all_egress" {
security_group_id = aws_security_group.bastion.id
}

data "template_file" "user_data" {
template = var.user_data_file != "" ? var.user_data_file : file("${path.module}/user_data.sh")

vars = {
s3_bucket_name = var.s3_bucket_name
s3_bucket_uri = var.s3_bucket_uri
ssh_user = var.ssh_user
keys_update_frequency = var.keys_update_frequency
enable_hourly_cron_updates = var.enable_hourly_cron_updates
additional_user_data_script = var.additional_user_data_script
}
}

//resource "aws_instance" "bastion" {
// ami = "${var.ami}"
// instance_type = "${var.instance_type}"
Expand All @@ -77,7 +64,14 @@ resource "aws_launch_configuration" "bastion" {
name_prefix = "${var.name}-"
image_id = var.ami
instance_type = var.instance_type
user_data = data.template_file.user_data.rendered
user_data = templatefile(var.user_data_file != "" ? var.user_data_file : "${path.module}/user_data.sh",{
s3_bucket_name = var.s3_bucket_name
s3_bucket_uri = var.s3_bucket_uri
ssh_user = var.ssh_user
keys_update_frequency = var.keys_update_frequency
enable_hourly_cron_updates = var.enable_hourly_cron_updates
additional_user_data_script = var.additional_user_data_script
})
enable_monitoring = var.enable_monitoring

security_groups = compact(
Expand Down