From f83801cb62035f7106ef9cdcf9c36a8dfac55524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20M=C3=BCller?= Date: Mon, 21 Jun 2021 21:34:24 +0200 Subject: [PATCH] removed cobald_facts module --- play.yml | 15 ++++++++++----- .../tasks/main.yml => cobald/tasks/facts.yml} | 0 roles/cobald/tasks/main.yml | 3 +-- 3 files changed, 11 insertions(+), 7 deletions(-) rename roles/{cobald_facts/tasks/main.yml => cobald/tasks/facts.yml} (100%) diff --git a/play.yml b/play.yml index e363563..69e2107 100644 --- a/play.yml +++ b/play.yml @@ -59,17 +59,21 @@ vars: container_privileged: True slurm_num_nodes: 10 - roles: + tasks: - name: "setup docker" - role: docker + import_role: name=docker tags: docker + - name: "get facts from existing cobald instance (i.e. hostname)" - role: cobald_facts + import_role: + name: cobald + tasks_from: facts vars: container_name: cobald tags: [ slurm, cobald ] + - name: "setup slurm test environment in docker containers" - role: slurm + import_role: name=slurm vars: slurm_user: slurm # or root num_nodes: "{{slurm_num_nodes}}" @@ -78,8 +82,9 @@ docker_network: slurm when: '"slurm" in group_names' tags: slurm + - name: "install cobald" - role: cobald + import_role: name=cobald vars: cobald_slurm: True container_name: cobald diff --git a/roles/cobald_facts/tasks/main.yml b/roles/cobald/tasks/facts.yml similarity index 100% rename from roles/cobald_facts/tasks/main.yml rename to roles/cobald/tasks/facts.yml diff --git a/roles/cobald/tasks/main.yml b/roles/cobald/tasks/main.yml index 7c5a3f9..a3d4ee1 100644 --- a/roles/cobald/tasks/main.yml +++ b/roles/cobald/tasks/main.yml @@ -111,8 +111,7 @@ - import_tasks: telegraf.yml - name: get cobald hostname - include_role: - name: cobald_facts + include_tasks: facts.yml when: cobald_container_hostname is not defined - name: run cobald container