Updating-file-names-3

Author: Matej Stajduhar

roles/aws/aws_iam_role/tasks/main.yml

@@ -30,22 +30,22 @@
     _assume_role_policy: "{{ lookup('file', aws_iam_role.policy_document + '_document_policy.json') }}"
   when: aws_iam_role.policy_document in allowed_strings and aws_iam_role.policy_document != "event"
 
-- name: Copy Gitlab configuration file.
+- name: Create assume role policy document if template is provided.
+  ansible.builtin.set_fact:
+    _assume_role_policy: "{{ aws_iam_role.policy_document }}"
+  when: aws_iam_role.policy_document not in allowed_strings
+
+- name: Create policy document if j2 file is provided.
   ansible.builtin.template:
     src: "{{ aws_iam_role.policy_document }}"
     dest: /tmp/policy_document.json
   when: (aws_iam_role.policy_document | basename) is match('.*\.j2$')
 
-- name: Create assume role policy document if event is provided.
+- name: Set var for Assume policy document.
   ansible.builtin.set_fact:
     _assume_role_policy: "/tmp/policy_document.json"
   when: (aws_iam_role.policy_document | basename) is match('.*\.j2$')
 
-- name: Create assume role policy document if template is provided.
-  ansible.builtin.set_fact:
-    _assume_role_policy: "{{ aws_iam_role.policy_document }}"
-  when: aws_iam_role.policy_document not in allowed_strings
-
 - name: Create an IAM role.
   amazon.aws.iam_role:
     profile: "{{ aws_iam_role.aws_profile }}"