X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Frundeck.yml;h=aa71570dd89307ccc7f24617ad75fe53b6f0aace;hb=refs%2Ftags%2Fv0.10;hp=1250d24b9a631f98424bca183f1c8217d5941f8b;hpb=95a202dcbd62d616698aedc7f993f91910b2187d;p=github%2Ffretlink%2Fansible-rundeck-jobs.git

diff --git a/tasks/rundeck.yml b/tasks/rundeck.yml
index 1250d24..aa71570 100644
--- a/tasks/rundeck.yml
+++ b/tasks/rundeck.yml
@@ -7,7 +7,7 @@
 
 - name: Create rundeck jobs
   uri:
-    url: "{{rundeck_api_url }}/{{rundeck_api_version}}/project/{{ rundeck_project }}/jobs/import"
+    url: "{{ rundeck_api_url }}/{{ rundeck_api_version }}/project/{{ rundeck_project }}/jobs/import"
     method: POST
     return_content: true
     body_format: raw
@@ -17,7 +17,7 @@
       Content-Type: application/x-www-form-urlencoded; charset=utf-8
       X-Rundeck-Auth-Token: "{{ rundeck_api_token }}"
   register: rundeck_create_jobs
-  with_items: "{{ rundeck_jobs_files.files}}"
+  with_items: "{{ rundeck_jobs_files.files }}"
 
 - name: Check if a job failed
   fail:
@@ -33,13 +33,14 @@
 
 - name: Get all jobs
   uri:
-    url: "{{rundeck_api_url }}/{{rundeck_api_version}}/project/{{ rundeck_project }}/jobs?groupPathExact={{ rundeck_jobs_group | default(rundeck_empty_group_path) }}"
+    url: "{{ rundeck_api_url }}/{{ rundeck_api_version }}/project/{{ rundeck_project }}/jobs?groupPathExact={{ rundeck_group_path }}"
     method: GET
     headers:
       Accept: application/json
       X-Rundeck-Auth-Token: "{{ rundeck_api_token }}"
   vars:
     rundeck_empty_group_path: ''
+    rundeck_group_path: "{{ rundeck_jobs_group | default(rundeck_empty_group_path) }}"
   register: rundeck_existing_jobs
   when: rundeck_remove_missing
 
@@ -54,7 +55,7 @@
 
 - name: "Remove jobs not in the directory"
   uri:
-    url: "{{rundeck_api_url }}/{{rundeck_api_version}}/job/{{ item }}"
+    url: "{{ rundeck_api_url }}/{{ rundeck_api_version }}/job/{{ item }}"
     method: DELETE
     headers:
       Accept: application/json