From 6b4de55d34fc77d40c1de230f513b29e597985e6 Mon Sep 17 00:00:00 2001 From: Greg Harvey Date: Wed, 11 Jun 2025 12:59:03 +0200 Subject: [PATCH] Removing AMI from EC2 standalone play and fixing bad line in user-data. --- plays/aws_ec2_standalone/ec2.yml | 2 -- roles/aws/aws_ec2_with_eip/templates/user-data-debian.sh.j2 | 1 - 2 files changed, 3 deletions(-) diff --git a/plays/aws_ec2_standalone/ec2.yml b/plays/aws_ec2_standalone/ec2.yml index 84b2bcfbc..173e56168 100644 --- a/plays/aws_ec2_standalone/ec2.yml +++ b/plays/aws_ec2_standalone/ec2.yml @@ -15,8 +15,6 @@ tasks: - ansible.builtin.import_role: name: _init - - ansible.builtin.import_role: - name: aws/aws_ami - ansible.builtin.import_role: name: aws/aws_ec2_with_eip - ansible.builtin.import_role: diff --git a/roles/aws/aws_ec2_with_eip/templates/user-data-debian.sh.j2 b/roles/aws/aws_ec2_with_eip/templates/user-data-debian.sh.j2 index 9f4598801..09db4ab09 100644 --- a/roles/aws/aws_ec2_with_eip/templates/user-data-debian.sh.j2 +++ b/roles/aws/aws_ec2_with_eip/templates/user-data-debian.sh.j2 @@ -13,7 +13,6 @@ CONTROLLER_PUBKEY="{{ aws_ec2_with_eip.pubkey }}" /usr/bin/echo "$CONTROLLER_USER":"$CONTROLLER_USER" | chpasswd -m /usr/bin/install -m 755 -o "" -g "$CONTROLLER_USER" -d /home/"$CONTROLLER_USER" /usr/bin/install -m 700 -o "$CONTROLLER_USER" -g "$CONTROLLER_USER" -d /home/"$CONTROLLER_USER"/.ssh -/usr/bin/install -m 644 -o "$CONTROLLER_USER" -g "$CONTROLLER_USER" -d /home/"$CONTROLLER_USER"/.ssh/authorized_keys /usr/bin/echo root:"$CONTROLLER_USER" | chpasswd -m /usr/bin/echo "$CONTROLLER_USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/"$CONTROLLER_USER" /usr/bin/chmod 0440 /etc/sudoers.d/"$CONTROLLER_USER"