From 6c674ff530ee1711456343aa7458d1af24f0a1bd Mon Sep 17 00:00:00 2001 From: BluemediaGER Date: Wed, 15 Mar 2023 22:55:38 +0100 Subject: [PATCH] Use command instead of docker_compose plugin --- metal/roles/pxe-cleanup/tasks/main.yml | 5 +---- metal/roles/pxe-server/defaults/main.yml | 2 +- metal/roles/pxe-server/tasks/main.yml | 7 +------ metal/roles/wol-wake/tasks/main.yml | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/metal/roles/pxe-cleanup/tasks/main.yml b/metal/roles/pxe-cleanup/tasks/main.yml index 8ad9db7..4e5ce79 100644 --- a/metal/roles/pxe-cleanup/tasks/main.yml +++ b/metal/roles/pxe-cleanup/tasks/main.yml @@ -1,8 +1,5 @@ - name: Tear down PXE stack - docker_compose: - project_name: "pxe" - project_src: "{{ playbook_dir }}/roles/pxe-server/files/" - state: absent + ansible.builtin.command: "docker compose --project-name pxe down" - name: Remove preseed files file: diff --git a/metal/roles/pxe-server/defaults/main.yml b/metal/roles/pxe-server/defaults/main.yml index b152d8d..74f9940 100644 --- a/metal/roles/pxe-server/defaults/main.yml +++ b/metal/roles/pxe-server/defaults/main.yml @@ -1,2 +1,2 @@ os_download_url: "https://deb.debian.org/debian/dists/bullseye/main/installer-amd64/current/images/netboot/netboot.tar.gz" -os_download_checksum: "sha256:ec3b71964457f30a57061ea758c12394bf2b792b461c697e61cc2d47053c5878" \ No newline at end of file +os_download_checksum: "sha256:e8edf26ac9837d7dbbcfd96f47f51530260a6c68568938978e1b63ea698d5663" diff --git a/metal/roles/pxe-server/tasks/main.yml b/metal/roles/pxe-server/tasks/main.yml index 8881633..b77e4e2 100644 --- a/metal/roles/pxe-server/tasks/main.yml +++ b/metal/roles/pxe-server/tasks/main.yml @@ -30,9 +30,4 @@ loop: "{{ groups['metal'] }}" - name: Start PXE stack - docker_compose: - project_src: "{{ role_path }}/files" - project_name: "pxe" - state: present - restarted: true - build: true \ No newline at end of file + ansible.builtin.command: "docker compose --project-name pxe -f {{ role_path }}/files/docker-compose.yml up -d --build" \ No newline at end of file diff --git a/metal/roles/wol-wake/tasks/main.yml b/metal/roles/wol-wake/tasks/main.yml index 935f3f2..275e525 100644 --- a/metal/roles/wol-wake/tasks/main.yml +++ b/metal/roles/wol-wake/tasks/main.yml @@ -5,4 +5,4 @@ - name: Wait for machines to come online with installed OS wait_for_connection: - timeout: 600 \ No newline at end of file + timeout: 900 \ No newline at end of file