Fix ocp-workloads failing because of locate_env_authorized_key role (#…

…4616) * Add missing condition to cloud infra ec2 Make sure the locate_env_authorized_key role is executed only when needed. * Add a default to avoid undefined variable error
redhat-cop · Apr 11, 2022 · 5cdcb55 · 5cdcb55
1 parent 0504670
commit 5cdcb55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ansible/cloud_providers/ec2_infrastructure_deployment.yml b/ansible/cloud_providers/ec2_infrastructure_deployment.yml
@@ -40,6 +40,7 @@
     - name: Locate environment SSH key
       include_role:
         name: locate_env_authorized_key
+      when: instances | default([]) | length > 0
 
     - name: Create keypair in ec2
       include_role:

diff --git a/ansible/roles/locate_env_authorized_key/tasks/main.yaml b/ansible/roles/locate_env_authorized_key/tasks/main.yaml
@@ -10,7 +10,7 @@
       {%- elif hostvars.localhost.infra_ssh_key is defined -%}
       {{ hostvars.localhost.infra_ssh_key }}
       {%- else -%}
-      {{ output_dir }}/{{ env_authorized_key }}
+      {{ output_dir }}/{{ env_authorized_key | default(guid ~ 'key') }}
       {%- endif -%}
 
 - name: Set env_authorized_key_path_pub