From 55c9a346b1afe090d47071c8e32db3285f3577a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 26 Nov 2022 00:28:28 +0100 Subject: [PATCH] WIP. --- deploy.sh | 2 +- roles/docker/tasks/services.yml | 15 +++++++-------- roles/docker/tasks/services/restic_backup.yml | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/deploy.sh b/deploy.sh index 3649dc5..b3f95eb 100755 --- a/deploy.sh +++ b/deploy.sh @@ -18,7 +18,7 @@ else $BASE_CMD --tags setup_services else echo "Deploying services: $2" - $BASE_CMD --tags setup_services --extra-vars "enabled_services=$2" + $BASE_CMD --tags setup_services --extra-vars "single_service=$2" fi ;; "base") diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml index 73537b0..a413530 100644 --- a/roles/docker/tasks/services.yml +++ b/roles/docker/tasks/services.yml @@ -3,12 +3,11 @@ docker_network: name: external_services -#- name: setup services -# include_tasks: "services/{{ item.value.file }}" -# loop: "{{ services | dict2items }}" -# when: item.key in enabled_services and item.value.file is defined and item.value.disabled_in_vagrant is not defined - - name: setup services - include_tasks: "services/{{ services[item].file }}" - loop: "{{ enabled_services }}" - when: item in services and services[item].file is defined and services[item].disabled_in_vagrant is not defined + include_tasks: "services/{{ item.value.file }}" + loop: "{{ services | dict2items }}" + when: single_service is not defined and item.value.file is defined and item.value.disabled_in_vagrant is not defined + +- name: setup single service + include_tasks: "services/{{ services[single_service].file }}" + when: single_service is defined and single_service in services and services[single_service].file is defined and services[single_service].disabled_in_vagrant is not defined diff --git a/roles/docker/tasks/services/restic_backup.yml b/roles/docker/tasks/services/restic_backup.yml index 81aec8f..9dddb49 100644 --- a/roles/docker/tasks/services/restic_backup.yml +++ b/roles/docker/tasks/services/restic_backup.yml @@ -1,6 +1,5 @@ --- - name: Setup restic backup - when: not vagrant docker_compose: project_name: restic_backup pull: true