From 8b3aeef8e8b81512ed958812ff99655dcb25b235 Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Fri, 16 Aug 2024 14:27:52 +0200 Subject: [PATCH 1/4] Use named Ansible Playbook --- .../job_templates/download_and_execute_script.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb index 9ed7a25d..66b2051b 100644 --- a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb +++ b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb @@ -15,7 +15,8 @@ model: JobTemplate %> --- -- hosts: all +- name: "Run script" + hosts: all tasks: - uri: url: <%= input("url") %> From 74b758d3d81c7ac5fd99583f767250d24b2e07ba Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Fri, 16 Aug 2024 14:30:14 +0200 Subject: [PATCH 2/4] Use named tasks and FQCN --- .../job_templates/download_and_execute_script.erb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb index 66b2051b..121da012 100644 --- a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb +++ b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb @@ -18,12 +18,16 @@ model: JobTemplate - name: "Run script" hosts: all tasks: - - uri: + - name: "Download script" + ansible.builtin.uri: url: <%= input("url") %> return_content: true register: script_response - - shell: + - name: "Run script" + ansible.builtin.shell: cmd: | {{script_response.content}} register: out - - debug: var=out + - name: "Show output" + ansible.builtin.debug: + var: out From 3f760a3a7e68bc672376615bc995bc85d1a8215b Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Fri, 16 Aug 2024 14:40:16 +0200 Subject: [PATCH 3/4] Fix spacing for Jinja2 template --- .../job_templates/download_and_execute_script.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb index 121da012..9f818f58 100644 --- a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb +++ b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb @@ -26,7 +26,7 @@ model: JobTemplate - name: "Run script" ansible.builtin.shell: cmd: | - {{script_response.content}} + {{ script_response.content }} register: out - name: "Show output" ansible.builtin.debug: From 8a4cb6abb185f97cfa9e01bfeeb3fea02f93fd9e Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Fri, 16 Aug 2024 14:51:59 +0200 Subject: [PATCH 4/4] Ignore idempotency in Ansible for shell cmd --- .../job_templates/download_and_execute_script.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb index 9f818f58..61726e84 100644 --- a/app/views/foreman_ansible/job_templates/download_and_execute_script.erb +++ b/app/views/foreman_ansible/job_templates/download_and_execute_script.erb @@ -28,6 +28,7 @@ model: JobTemplate cmd: | {{ script_response.content }} register: out + changed_when: true # noqa: no-changed-when - name: "Show output" ansible.builtin.debug: var: out