Fixed name and variable (#8839)

redhat-cop · Nov 19, 2024 · a008d14 · a008d14
1 parent 440140e
commit a008d14
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/ansible/roles/automation_platform_loader/defaults/main.yml b/ansible/roles/automation_platform_loader/defaults/main.yml
@@ -1,6 +1,7 @@
 ---
 automation_platform_loader_generate_ssh_keypair: true
-automation_platform_loader_aap_version: 2.x
+# Default is legacy to support earlier version than aap 2.5
+automation_platform_loader_aap_version: legacy
 
 automation_platform_loader_ssh_key_type: ed25519
 automation_platform_loader_ssh_key_path: "/tmp/id_{{ automation_platform_loader_ssh_key_type }}"
diff --git a/ansible/roles/automation_platform_loader/tasks/aap/aap-2.5.yml b/ansible/roles/automation_platform_loader/tasks/aap/aap-2.5.yml
@@ -10,7 +10,6 @@
   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 }}"

diff --git a/...ion_platform_loader/tasks/aap/aap-2.x.yml → ..._platform_loader/tasks/aap/aap-legacy.yml b/...ion_platform_loader/tasks/aap/aap-2.x.yml → ..._platform_loader/tasks/aap/aap-legacy.yml
@@ -10,7 +10,6 @@
   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 }}"