From 6fc3e3f6532dc4c08eecaa485f5c4400cc050714 Mon Sep 17 00:00:00 2001
From: Greg Harvey <greg.harvey@gmail.com>
Date: Thu, 12 Jun 2025 17:20:22 +0200
Subject: [PATCH] Removing cloud-config script and making shell script respect
 _init role paths.

---
 .../templates/cloud-config-debian.j2          | 21 -------------------
 .../templates/user-data-debian.sh.j2          |  8 ++++---
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 roles/aws/aws_ec2_with_eip/templates/cloud-config-debian.j2

diff --git a/roles/aws/aws_ec2_with_eip/templates/cloud-config-debian.j2 b/roles/aws/aws_ec2_with_eip/templates/cloud-config-debian.j2
deleted file mode 100644
index 6a96e5c14..000000000
--- a/roles/aws/aws_ec2_with_eip/templates/cloud-config-debian.j2
+++ /dev/null
@@ -1,21 +0,0 @@
-#cloud-config
-repo_update: true
-repo_upgrade: all
-packages:
-  - python3-venv
-  - python3-debian
-
-users:
-  - name: {{ _ce_provision_username }}
-    primary_group: {{ _ce_provision_username }}
-    homedir: /home/{{ _ce_provision_username }}
-    system: true
-    shell: /bin/bash
-    sudo: "ALL=(ALL) NOPASSWD:ALL"
-    ssh_authorized_keys:
-      - {{ aws_ec2_with_eip.pubkey }}
-
-runcmd:
-  - [ su, -, {{ _ce_provision_username }}, -c, "/usr/bin/python3 -m venv /home/{{ _ce_provision_username }}/ce-python" ]
-  - [ su, -, {{ _ce_provision_username }}, -c, "/home/{{ _ce_provision_username }}/ce-python/bin/python3 -m pip install --upgrade pip" ]
-  - [ su, -, {{ _ce_provision_username }}, -c, "/home/{{ _ce_provision_username }}/ce-python/bin/pip install ansible netaddr python-debian" ]
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 9b1ef912c..4d761946d 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
@@ -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"
@@ -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"