From 2a45fef49757da548960ce6ea69c695a73365c12 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Sun, 13 Feb 2022 21:04:43 -0500 Subject: [PATCH] remove unneeded vars, variablize recovery stuffs for block/rescue in inmem-test.yml --- inmem-test.yml | 7 ++----- vars/defaults.yml | 13 +++++++++++++ vars/job_launch_file_creation.yml | 13 ------------- 3 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 vars/job_launch_file_creation.yml diff --git a/inmem-test.yml b/inmem-test.yml index 0affd73..144a876 100644 --- a/inmem-test.yml +++ b/inmem-test.yml @@ -28,7 +28,6 @@ vars_files: - vars/defaults.yml - - vars/job_launch_file_creation.yml tasks: @@ -57,11 +56,9 @@ - "tower_provision_msg : {{ r_check_file.msg }}" - - name: Re-create files as needed + - name: Execute recovery API callback uri: - url : - "{{ tower_api_host }}/api/v2/job_templates/\ - {{ tower_launch_jobs[0].job_template }}/launch/" + url : "{{ recovery_callback_url }}" method : POST status_code : 201 force_basic_auth : yes diff --git a/vars/defaults.yml b/vars/defaults.yml index 7d0aecc..d9eb36c 100644 --- a/vars/defaults.yml +++ b/vars/defaults.yml @@ -2,3 +2,16 @@ tower_api_host : https://tower2.thezengarden.net tower_api_user : admin tower_api_pass : redhat + + +# Sample Job Template ID in Tower/AAP to use +# for testing via inmem-test.yml: +sample_job_template: 27 + + +# Callback URL for inmem-test.yml's rescue block: +recovery_callback_url: "{{ tower_api_host }}/api/v2/job_templates/\ + {{ sample_job_template }}/launch/" + + +... diff --git a/vars/job_launch_file_creation.yml b/vars/job_launch_file_creation.yml deleted file mode 100644 index 2455736..0000000 --- a/vars/job_launch_file_creation.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -tower_launch_jobs: - - name: file_creation_test - job_template : 27 - extra_vars : - fail_host : "{{ inventory_hostname }}" - fail_rc : "{{ r_check_file.rc }}" - fail_stdout : "{{ r_check_file.stdout }}" - fail_stderr : "{{ r_check_file.stderr }}" - fail_msg : "{{ r_check_file.msg }}" - - -...