Merge pull request #27 from gaetanfl/fix_upstream_creation_return_code

[github/fretlink/ansible-kong-app.git] / tasks / routes.yml

diff --git a/tasks/routes.yml b/tasks/routes.yml
index 1a9f6dbafd040c3198e0d12ee0d357b8bfb322c8..3ff25077350a740d658855483e21894e50e50044 100644 (file)
--- a/tasks/routes.yml
+++ b/tasks/routes.yml
@@ -1,32 +1,31 @@
 - name: Get app routes
   uri:
-    url: "{{ kong_app_admin_url }}/services/{{ kong_app_service_name }}/routes"
+    url: "{{ server.kong_app_admin_url }}/services/{{ service.name }}/routes"
     method: GET
     validate_certs: no
+    headers:
+      apikey: "{{ server.kong_app_admin_apikey }}"
   register: kong_app_service_routes_check
 
-- name: Set routes facts
-  set_fact:
-    kong_app_current_routes: "{{ kong_app_service_routes_check.json |default('{\"data\": []}') | from_json }}"
-
 - name: Setup route
   uri:
-    url: "{{ kong_app_admin_url }}/services/{{ kong_app_service_name }}/routes"
+    url: "{{ server.kong_app_admin_url }}/services/{{ service.name }}/routes"
     method: POST
     body: "{{ route | to_json }}"
     headers:
-      apikey: "{{ kong_app_admin_apikey }}"
+      apikey: "{{ server.kong_app_admin_apikey }}"
       Content-Type: application/json
     status_code: 201
-  with_items: "{{ kong_app_routes }}"
+  with_items: "{{ service.routes | default([]) }}"
   loop_control:
     loop_var: route
 
 - name: Delete old routes
   uri:
-    url: "{{ kong_app_admin_url }}/services/routes/{{ item.id }}"
+    url: "{{ server.kong_app_admin_url }}/routes/{{ item.id }}"
     method: DELETE
     headers:
-      apikey: "{{ kong_app_admin_apikey }}"
+      apikey: "{{ server.kong_app_admin_apikey }}"
     status_code: 204
-  with_items: "{{ kong_app_current_routes.data }}"
+  with_items: "{{ kong_app_service_routes_check.json.data }}"
+  when: not kong_app_service_routes_check is skipped