Merge pull request #379 from SkynetLabs/fix-prepare-test-user

Fix creating test user

playbooks/tasks/portal-docker-services-start.yml

@@ -50,39 +50,6 @@
   debug:
     msg: "{{ inventory_hostname + ' docker services start: ' + lookup('pipe','date +%Y-%m-%dT%H:%M:%S') + ' UTC' }}"
 
-# Prepare test user and its Skynet API key (if needed) otherwise health-check
-# container keeps restarting.
-
-- name: Get API key is defined flag
-  ansible.builtin.set_fact:
-    api_key_defined: "{{ webportal_server_config.accounts_test_user_api_key | default('not-defined') != 'not-defined' }}"
-
-- block:
-    - name: Start accounts and nginx docker services (so we can prepare test user)
-      community.docker.docker_compose:
-        project_src: "{{ webportal_dir }}"
-        files: "{{ webportal_docker_compose_files_wanted }}"
-        services:
-          - "accounts"
-          - "nginx"
-        build: "{{ docker_compose_build }}"
-        remove_orphans: True
-        nocache: True
-        pull: True
-        state: present
-      become: True
-      become_user: "user"
-
-    # Prepare test user and API key when portal is not anonymous and Skynet API
-    # key was not yet set.
-    - name: Include preparing Accounts test user
-      include_tasks: tasks/portal-accounts-test-user-prepare.yml
-  when:
-    - portal_action in ['portal-setup-and-deploy', 'portal-setup']
-    - portal_accounts_on
-    - not portal_is_anonymous
-    - mongo_replicaset_initialized | default(False) or not api_key_defined
-
 # Start the docker services (on deploy also build images)
 - name: Start the docker services (on deploy also build images)
   community.docker.docker_compose:
@@ -98,6 +65,18 @@
   become_user: "user"
   register: docker_compose_start_result
 
+# Prepare test user and its API key when portal is not anonymous and Skynet API
+# key was not yet set otherwise health-check container keeps restarting.
+- name: Include preparing Accounts test user
+  vars:
+    api_key_defined: "{{ webportal_server_config.accounts_test_user_api_key | default('not-defined') != 'not-defined' }}"
+  include_tasks: tasks/portal-accounts-test-user-prepare.yml
+  when:
+    - portal_action in ['portal-setup-and-deploy', 'portal-setup']
+    - portal_accounts_on
+    - not portal_is_anonymous
+    - mongo_replicaset_initialized | default(False) or not api_key_defined
+
 # Set list of started docker compose services
 - name: Set list of started docker compose services
   set_fact: