From 3587531bdaf3e3071db489f356b54934192da84c Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 15 Aug 2025 15:45:20 +0200 Subject: [PATCH] Removed unnecessary wait_for logic from mig --- roles/web-app-mig/config/main.yml | 2 -- roles/web-app-mig/tasks/01_core.yml | 2 +- roles/web-app-mig/tasks/02_build_data.yml | 24 ------------------- .../templates/docker-compose.yml.j2 | 4 ++-- roles/web-app-mig/vars/main.yml | 7 +++--- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/roles/web-app-mig/config/main.yml b/roles/web-app-mig/config/main.yml index a77d4f58..a9425e88 100644 --- a/roles/web-app-mig/config/main.yml +++ b/roles/web-app-mig/config/main.yml @@ -42,5 +42,3 @@ build_data: # Enables the building of the meta data which the graph requiers enabled: true - # Recommended to set this to false in inventory to optimize speed - wait_for: true diff --git a/roles/web-app-mig/tasks/01_core.yml b/roles/web-app-mig/tasks/01_core.yml index 470944fb..9e2b77be 100644 --- a/roles/web-app-mig/tasks/01_core.yml +++ b/roles/web-app-mig/tasks/01_core.yml @@ -22,4 +22,4 @@ - name: Build data (single async task) include_tasks: 02_build_data.yml - when: mig_build_data | bool + when: MIG_BUILD_DATA | bool diff --git a/roles/web-app-mig/tasks/02_build_data.yml b/roles/web-app-mig/tasks/02_build_data.yml index 557320e3..f29ba490 100644 --- a/roles/web-app-mig/tasks/02_build_data.yml +++ b/roles/web-app-mig/tasks/02_build_data.yml @@ -12,27 +12,3 @@ msg: > MIG build job failed to start. No job ID returned. when: mig_build_job.ansible_job_id is not defined - -- name: Debug MIG build job ID - debug: - msg: "MIG build job started with ID: {{ mig_build_job.ansible_job_id }}" - when: MODE_DEBUG | bool - -- debug: - msg: "Waiting for MIG build job to finish. Set 'build_data.wait_for=false' in the application config to skip waiting and improve performance." - when: mig_wait_for_build | bool - -- name: Wait for MIG build job to finish (enforce failure) - async_status: - jid: "{{ mig_build_job.ansible_job_id }}" - register: mig_build_result - until: mig_build_result.finished - retries: 360 - delay: 10 - when: - - mig_wait_for_build | bool - failed_when: - - mig_build_result.result is defined - - mig_build_result.result.rc is defined - - mig_build_result.result.rc != 0 - diff --git a/roles/web-app-mig/templates/docker-compose.yml.j2 b/roles/web-app-mig/templates/docker-compose.yml.j2 index 8d947170..33295c62 100644 --- a/roles/web-app-mig/templates/docker-compose.yml.j2 +++ b/roles/web-app-mig/templates/docker-compose.yml.j2 @@ -3,8 +3,8 @@ {{ application_id | get_entity_name }}: {% set container_port = 80 %} {% include 'roles/docker-container/templates/base.yml.j2' %} - image: "{{ mig_image }}" - container_name: "{{ mig_container }}" + image: "{{ MIG_IMAGE }}" + container_name: "{{ MIG_CONTAINER }}" ports: - 127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }} build: diff --git a/roles/web-app-mig/vars/main.yml b/roles/web-app-mig/vars/main.yml index 8d02501c..9968f0b2 100644 --- a/roles/web-app-mig/vars/main.yml +++ b/roles/web-app-mig/vars/main.yml @@ -7,7 +7,6 @@ docker_pull_git_repository: true docker_repository_address: "https://github.com/kevinveenbirkenbach/meta-infinite-graph" # Helper variables -mig_image: "mig:latest" -mig_container: "mig" -mig_build_data: "{{ applications | get_app_conf(application_id, 'build_data.enabled') }}" -mig_wait_for_build: "{{ applications | get_app_conf(application_id, 'build_data.wait_for') }}" \ No newline at end of file +MIG_IMAGE: "mig:latest" +MIG_CONTAINER: "mig" +MIG_BUILD_DATA: "{{ applications | get_app_conf(application_id, 'build_data.enabled') }}" \ No newline at end of file