From 0577e1ee790de4ed59863bd23a66e940f687701c Mon Sep 17 00:00:00 2001
From: Seth Foster <fosterbseth@gmail.com>
Date: Tue, 22 Aug 2023 11:41:44 -0400
Subject: [PATCH] Setup receptor after podman

Might help to install receptor last,
that way when nodes are first connected to the mesh
they already have podman installed and can potentially
run jobs. Otherwise it might be possible for controller
to launch jobs against nodes that aren't fully set up.
---
 .../templates/instance_install_bundle/group_vars/all.yml  | 1 -
 .../instance_install_bundle/install_receptor.yml          | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/awx/api/templates/instance_install_bundle/group_vars/all.yml b/awx/api/templates/instance_install_bundle/group_vars/all.yml
index ac595003c5..861572748c 100644
--- a/awx/api/templates/instance_install_bundle/group_vars/all.yml
+++ b/awx/api/templates/instance_install_bundle/group_vars/all.yml
@@ -1,4 +1,3 @@
-receptor_host_identifier: {{ instance.hostname }}
 receptor_user: awx
 receptor_group: awx
 receptor_verify: true
diff --git a/awx/api/templates/instance_install_bundle/install_receptor.yml b/awx/api/templates/instance_install_bundle/install_receptor.yml
index 6079f0c712..8e1b09951e 100644
--- a/awx/api/templates/instance_install_bundle/install_receptor.yml
+++ b/awx/api/templates/instance_install_bundle/install_receptor.yml
@@ -1,16 +1,16 @@
-{% verbatim %}
 ---
 - hosts: all
   become: yes
   tasks:
     - name: Create the receptor user
       user:
+{% verbatim %}
         name: "{{ receptor_user }}"
-        shell: /bin/bash
-    - import_role:
-        name: ansible.receptor.setup
 {% endverbatim %}
+        shell: /bin/bash
 {% if instance.node_type == "execution" %}
     - import_role:
         name: ansible.receptor.podman
 {% endif %}
+    - import_role:
+        name: ansible.receptor.setup