From 5e0b90ffa7542540f0ac969da7bc692eab02d5f5 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Sun, 21 Apr 2024 18:51:59 +0300 Subject: [PATCH] Revise docker ansible script - use include/import_tasks instead of the deprecated include. Used include_tasks for nginx tasks because they might cause problems due to depending on the nginxConfig variable inside the conditional statements. Used import_tasks for docker tasks since they seem like they can be safely pre-processed. - remove task installing docker module for python --- data/ansible/docker/docker.yaml | 3 --- data/ansible/docker/main.yaml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/data/ansible/docker/docker.yaml b/data/ansible/docker/docker.yaml index ad14359a4..5988e4fc1 100644 --- a/data/ansible/docker/docker.yaml +++ b/data/ansible/docker/docker.yaml @@ -37,9 +37,6 @@ enabled: yes masked: no -- name: Install Docker Module for Python - shell: "pip3 install docker" - - name: Creates directory become: yes file: diff --git a/data/ansible/docker/main.yaml b/data/ansible/docker/main.yaml index 928b04b73..8503e851d 100644 --- a/data/ansible/docker/main.yaml +++ b/data/ansible/docker/main.yaml @@ -57,7 +57,7 @@ register: nginxConfig - name: Configure NGINX server - include: nginx.yaml + include_tasks: nginx.yaml when: nginxConfig.stdout_lines|length < 1 or users_filename|length > 0 - name: Enable and start nginx @@ -68,7 +68,7 @@ enabled: yes - name: Configure docker - include: docker.yaml + import_tasks: docker.yaml ########################################################################################################################### ###########################################################################################################################