Revert "adding task and condition for aap2.5"

ansible/roles/ansible_bu_setup_workshop/defaults/main.yml

@@ -6,12 +6,6 @@
 workshop_type: rhel
 workshop_version: 1.0.18
 
-# Enable offline image base AAP repo
-ansible_bu_setup_workshop_enable_offline_aap_repo: true
-ansible_bu_setup_workshop_aap_packages:
-  - ansible-core
-  - ansible-navigator
-
 # Ansible BU exercise base directory 
 ansible_bu_setup_workshop_exercise_src: ansible_rhel
 # Destination directory where exercise will be copied 

ansible/roles/ansible_bu_setup_workshop/tasks/common/ansible-navigator.yml

@@ -9,7 +9,6 @@
   delegate_to: localhost
 
 - name: Enable offline automation controller repo
-  when: ansible_bu_setup_workshop_enable_offline_aap_repo | bool
   community.general.ini_file:
     path: "/etc/yum.repos.d/ansible-automation-platform.repo"
     section: ansible-automation-platform
@@ -18,7 +17,9 @@
 
 - name: Install ansible core & navigator
   ansible.builtin.dnf:
-    name: "{{ ansible_bu_setup_workshop_aap_packages }}"
+    name:
+      - ansible-core
+      - ansible-navigator
     state: present
 
 - name: Install ansible.cfg in home directory

ansible/roles/automation_platform_loader/defaults/main.yml

@@ -1,6 +1,5 @@
 ---
 automation_platform_loader_generate_ssh_keypair: true
-automation_platform_loader_create_token: 2.4
 
 automation_platform_loader_ssh_key_type: ed25519
 automation_platform_loader_ssh_key_path: "/tmp/id_{{ automation_platform_loader_ssh_key_type }}"

ansible/roles/automation_platform_loader/tasks/main.yml

@@ -21,7 +21,6 @@
   block:
 
     - name: Create a new AAP2 Auth token using controller username/password
-      when: automation_platform_loader_aap_version <= 2.4
       awx.awx.token:
         description: Creating token to configure AAP2 resources
         scope: write
@@ -31,19 +30,7 @@
       retries: 10
       delay: 30
 
-    - name: Create a new AAP2 Auth token using controller username/password
-      when: automation_platform_loader_aap_version > 2.4
-      ansible.controller.token:
-        description: Creating token to configure AAP2 resources
-        scope: write
-        state: present
-      register: r_aap2_token
-      until: r_aap2_token.failed == false
-      retries: 10
-      delay: 30
-
     - name: Set agnosticd_user_info ssh data
-      when: automation_platform_loader_create_token | bool
       agnosticd_user_info:
         data:
           aap_controller_token: "{{ r_aap2_token.ansible_facts.controller_token.token }}"