Avoid FQDN for OEM Hosts

ministryofjustice · Mar 7, 2024 · bef8412 · bef8412
1 parent 9a2a314
commit bef8412
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/ansible/roles/oracle-oem-agent-setup/tasks/agent_target_promote.yml b/ansible/roles/oracle-oem-agent-setup/tasks/agent_target_promote.yml
@@ -65,6 +65,7 @@
       loop:
         - emcli_setup.sh
         - add_targets.sh
+      tags: clean_up
 
   # block
   become: true

diff --git a/ansible/roles/oracle-oem-agent-setup/tasks/oms_upgrade_agentpatcher.yml b/ansible/roles/oracle-oem-agent-setup/tasks/oms_upgrade_agentpatcher.yml
@@ -17,7 +17,7 @@
       register: agentpatcher_directory
 
     - name: Backup Old AgentPatcher
-      ansible.builtin.shell: mv {{ agent_home }}/AgentPatcher {{ agent_home  }}/AgentPatcher_PREV
+      ansible.builtin.shell: mv {{ agent_home }}/AgentPatcher {{ agent_home }}/AgentPatcher_PREV.$(date +%Y%m%d%H%M)
       when: agentpatcher_directory.stat.exists and agentpatcher_directory.stat.isdir
 
     - name: Unzip OMS AgentPatcher

diff --git a/ansible/roles/oracle-oem-agent-setup/templates/add_targets.sh.j2 b/ansible/roles/oracle-oem-agent-setup/templates/add_targets.sh.j2
@@ -8,6 +8,11 @@ HOST_FQDN_NAME=$(hostname --fqdn)
 
 # For delius hosts, we cannot use the hostname to determine the lifecycle status, so we use the tags instead
 APPLICATION="{{ ec2.tags['application'] }}"
+
+# For OEM hosts we do not use the FQDN for the targets  
+if [[ "${APPLICATION}" == "hmpps-oem" ]]; then
+   HOST_FQDN_NAME=${HOSTNAME}
+fi
 if [[ "${APPLICATION}" == "delius" ]]; then
    LIFECYCLE_STATUS=$(echo {{ ec2.tags['environment-name'].split('-')[-1] }})
    # First character must be made uppercase