more

linux-system-roles · Jan 5, 2024 · 143afa9 · 143afa9
1 parent 89a5e6b
commit 143afa9
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 27 deletions.
diff --git a/tests/tests_deploy_keys.yml b/tests/tests_deploy_keys.yml
@@ -6,22 +6,24 @@
 
 - name: Test nbde_server_deploy_keys
   hosts: all
-
-  vars:
-    nbde_server_keys_dir: /tmp/.nbde_server_keys_dir
-
   tasks:
     - name: Run tests
       block:
+        - name: Create tmpdir for server keys
+          tempfile:
+            state: directory
+            prefix: nbde_server_deploy_keys
+          register: __tmpdir
+          delegate_to: localhost
+
+        - name: Set nbde_server_keys_dir
+          set_fact:
+            nbde_server_keys_dir: "{{ __tmpdir.path }}"
+
         - name: Ensure we have keys
           include_role:
             name: linux-system-roles.nbde_server
 
-        - name: Clean up nbde_server_keys_dir
-          file:
-            path: "{{ nbde_server_keys_dir }}"
-            state: absent
-
         - name: Fetch the keys from every host
           include_role:
             name: linux-system-roles.nbde_server

diff --git a/tests/tests_fetch_keys_deploy_not_set.yml b/tests/tests_fetch_keys_deploy_not_set.yml
@@ -10,13 +10,20 @@
 
 - name: Test nbde_server_fetch_keys with nbde_server_deploy_keys not set
   hosts: all
-
-  vars:
-    nbde_server_keys_dir: /tmp/.nbde_server_keys_dir
-
   tasks:
     - name: Run tests
       block:
+        - name: Create tmpdir for server keys
+          tempfile:
+            state: directory
+            prefix: nbde_server_fetch_keys_deploy_not_set
+          register: __tmpdir
+          delegate_to: localhost
+
+        - name: Set nbde_server_keys_dir
+          set_fact:
+            nbde_server_keys_dir: "{{ __tmpdir.path }}"
+
         - name: Ensure we have keys
           include_role:
             name: linux-system-roles.nbde_server
@@ -31,11 +38,6 @@
               - ".*.jwk"
           register: nbde_server_host_keys
 
-        - name: Clean up nbde_server_keys_dir
-          file:
-            path: "{{ nbde_server_keys_dir }}"
-            state: absent
-
         - name: Run with nbde_server_deploy_keys not set to check the keys
           include_role:
             name: linux-system-roles.nbde_server

diff --git a/tests/tests_fetch_keys_deploy_set.yml b/tests/tests_fetch_keys_deploy_set.yml
@@ -15,13 +15,20 @@
 
 - name: Test nbde_server_fetch_keys with nbde_server_deploy_keys set
   hosts: all
-
-  vars:
-    nbde_server_keys_dir: /tmp/.nbde_server_keys_dir
-
   tasks:
     - name: Run tests
       block:
+        - name: Create tmpdir for server keys
+          tempfile:
+            state: directory
+            prefix: nbde_server_fetch_keys_deploy_set
+          register: __tmpdir
+          delegate_to: localhost
+
+        - name: Set nbde_server_keys_dir
+          set_fact:
+            nbde_server_keys_dir: "{{ __tmpdir.path }}"
+
         - name: Ensure we have keys
           include_role:
             name: linux-system-roles.nbde_server
@@ -37,11 +44,6 @@
               - ".*.jwk"
           register: nbde_server_host_common_keys
 
-        - name: Clean up nbde_server_keys_dir
-          file:
-            path: "{{ nbde_server_keys_dir }}"
-            state: absent
-
         - name: Run with nbde_server_deploy_keys set to check the common keys
           include_role:
             name: linux-system-roles.nbde_server