Merge pull request #22 from paulrbr-fl/improve-doc

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

diff --git a/tasks/kong-app.yml b/tasks/kong-app.yml
index df95f2ec27a1633d84d042dafa12b36ce762345e..975e2cdffb99458c51f75f5a98fb3accc53b89d1 100644 (file)
--- a/tasks/kong-app.yml
+++ b/tasks/kong-app.yml
@@ -1,23 +1,30 @@
+- name: Upstream Creation
+  import_tasks: upstream.yml
+  when: service.upstream is defined
+
 - name: Check if service exists
   uri:
-    url: "{{ kong_app_admin_url }}/services/{{ kong_app_service_name }}"
+    url: "{{ server.kong_app_admin_url }}/services/{{ service.name }}"
     method: GET
     headers:
-      apikey: "{{ kong_app_admin_apikey }}"
+      apikey: "{{ server.kong_app_admin_apikey }}"
     status_code: 200,404
   register: kong_app_check_service
 
 - name: Update or Create service
   uri:
-    url: "{{ kong_app_admin_url }}/services/{{ exists_service | ternary('', kong_app_service_name) }}"
+    url: "{{ server.kong_app_admin_url }}/services/{{ exists_service | ternary('', service.name) }}"
     method: "{{ exists_service | ternary('POST', 'PATCH') }}"
-    body: "{{ kong_app_service_body | to_json }}"
+    body: "{{ service_body | to_json }}"
     status_code: 200,201
     headers:
-      apikey: "{{ kong_app_admin_apikey }}"
+      apikey: "{{ server.kong_app_admin_apikey }}"
       Content-Type: application/json
   vars:
     exists_service: "{{ kong_app_check_service.status|default(404) == 404 }}"
+    service_body:
+      name: "{{ service.name }}"
+      url: "{{ service.url }}"
 
 - name: Setup plugins
   import_tasks: plugins.yml