Skip to content
This repository was archived by the owner on Oct 7, 2025. It is now read-only.

User data ec2 pr devel 2.x #2574

Merged
gregharvey merged 2 commits into from
Jun 12, 2025
Merged

User data ec2 pr devel 2.x #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fc3e3f
Removing cloud-config script and making shell script respect _init ro…
gregharvey Jun 12, 2025
ac6484e
Merge branch 'user_data_ec2' into user_data_ec2-PR-devel-2.x
gregharvey Jun 12, 2025
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
21 changes: 0 additions & 21 deletions roles/aws/aws_ec2_with_eip/templates/cloud-config-debian.j2
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions roles/aws/aws_ec2_with_eip/templates/user-data-debian.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ sysctl -w net.ipv6.conf.all.disable_ipv6=1
# Set bash vars
CONTROLLER_USER="{{ _ce_provision_username }}"
CONTROLLER_PUBKEY="{{ aws_ec2_with_eip.pubkey }}"
VENV_PATH="{{ _venv_path }}"
VENV_COMMAND="{{ _venv_command }}"

# Create provision user
/usr/sbin/useradd -s /bin/bash "$CONTROLLER_USER"
Expand All @@ -24,6 +26,6 @@ CONTROLLER_PUBKEY="{{ aws_ec2_with_eip.pubkey }}"
# Install Ansible
/usr/bin/apt-get install -y -o Dpkg::Options::="--force-confnew" python3-venv python3-debian
/usr/bin/chown -R "$CONTROLLER_USER":"$CONTROLLER_USER" /home/"$CONTROLLER_USER"
/usr/bin/su - "$CONTROLLER_USER" -c "/usr/bin/python3 -m venv /home/$CONTROLLER_USER/ce-python"
/usr/bin/su - "$CONTROLLER_USER" -c "/home/$CONTROLLER_USER/ce-python/bin/python3 -m pip install --upgrade pip"
/usr/bin/su - "$CONTROLLER_USER" -c "/home/$CONTROLLER_USER/ce-python/bin/pip install ansible netaddr python-debian"
/usr/bin/su - "$CONTROLLER_USER" -c "$VENV_COMMAND $VENV_PATH"
/usr/bin/su - "$CONTROLLER_USER" -c "$VENV_PATH/bin/python3 -m pip install --upgrade pip"
/usr/bin/su - "$CONTROLLER_USER" -c "$VENV_PATH/bin/pip install ansible netaddr python-debian"
Loading