diff --git a/roles/matrix-awx/tasks/delete_awx_templates.yml b/roles/matrix-awx/tasks/delete_awx_templates.yml index 79a19628f..cd180043e 100755 --- a/roles/matrix-awx/tasks/delete_awx_templates.yml +++ b/roles/matrix-awx/tasks/delete_awx_templates.yml @@ -318,21 +318,34 @@ validate_certs: yes when: matrix_domain is defined -#- name: Remove '<< SUBSCRIPTION DELETION IN PROGRESS >>' job template -# delegate_to: 127.0.0.1 -# awx.awx.tower_job_template: -# name: "0 - {{ subscription_id }} - << SUBSCRIPTION DELETION IN PROGRESS >>" -# job_type: run -# project: "{{ member_id }} - Matrix Docker Ansible Deploy" -# playbook: setup.yml -# state: absent -# tower_host: "https://{{ tower_host }}" -# tower_oauthtoken: "{{ tower_token.stdout }}" -# validate_certs: yes +- name: Save new 'Delete Job Template' survey.json to the AWX tower, template + delegate_to: 127.0.0.1 + template: + src: '{{ role_path }}/templates/delete_job_template.json.j2' + dest: '/var/lib/awx/projects/hosting/delete_job_template.json' -# make new extra vars file -# remake 'delete delete playbook' -# launch it +- name: Re-create '00 - Cleanup Deletion Template' job template + awx.awx.tower_job_template: + name: "00 - Cleanup Deletion Template" + description: "Deletes the remaining '<< SUBSCRIPTION DELETION IN PROGRESS >>' job template." + job_type: run + inventory: "{{ org_name }} [Admin]" + project: "Ansible Create Delete Subscription Membership" + playbook: cleanup_deletion_job_template.yml + extra_vars: "{{ lookup('file', '/var/lib/awx/projects/hosting/delete_job_template.json') }}" + ask_extra_vars: yes + state: present + verbosity: 1 + tower_host: "https://{{ tower_host }}" + tower_oauthtoken: "{{ tower_token.stdout }}" + validate_certs: yes + +- name: Launch '00 - Cleanup Deletion Template' job template before ending + awx.awx.tower_job_launch: + job_template: "00 - Cleanup Deletion Template" + tower_host: "https://{{ tower_host }}" + tower_oauthtoken: "{{ tower_token.stdout }}" + validate_certs: yes - name: Set boolean value to exit playbook set_fact: diff --git a/roles/matrix-awx/templates/delete_job_template.json.j2 b/roles/matrix-awx/templates/delete_job_template.json.j2 new file mode 100644 index 000000000..694337ce7 --- /dev/null +++ b/roles/matrix-awx/templates/delete_job_template.json.j2 @@ -0,0 +1,4 @@ +{ + "subscription_id": "{{ subscription_id }}", + "member_id": "{{ member_id }}" +}