Fix wait for galaxy task

galaxysrv.yml

@@ -84,9 +84,9 @@
       - name: Wait for galaxy server to come up
         ansible.builtin.uri:
           url: "http://localhost/api/version"
-          unix_socket: "{{ galaxy_config.gravity.gunicorn.bind }}"
+          unix_socket: "{{ _galaxy_gunicorn_socket_path }}"
         register: galaxy_service_live
-        until: "galaxy_service_live is not failed"
+        until: "galaxy_service_live.status == 200"
         retries: 60
         delay: 10 # check every 10 seconds for a maximum of 10 minutes
 
@@ -101,12 +101,13 @@
 
   post_tasks:
 
-    - name: Remove bootstrap API key
-      when: _galaxy_bootstrap
-      ansible.builtin.lineinfile:
-        path: "{{ galaxy_config_dir }}/galaxy.yml"
-        regexp: '.*bootstrap_admin_api_key:'
-        state: absent
+    # - name: Remove bootstrap API key
+    #   when: _galaxy_bootstrap
+    #   ansible.builtin.lineinfile:
+    #     path: "{{ galaxy_config_dir }}/galaxy.yml"
+    #     regexp: '.*bootstrap_admin_api_key:'
+    #     state: absent
+    #   notify: galaxy gravity restart
 
   handlers:
 

vars/galaxy_vars.yml

@@ -24,9 +24,8 @@ postgresql_objects_users:
 postgresql_objects_databases:
   - name: galaxy
     owner: galaxy
-gunicorn_socket_dir: "{{ _src_galaxy_root}}/run"
 galaxy_extra_dirs:
-  - "{{ gunicorn_socket_dir }}"
+  - "{{ _galaxy_gunicorn_socket_dir }}"
 galaxy_job_config:
   runners:
     local_runner:
@@ -59,7 +58,7 @@ galaxy_config:
     process_manager: systemd
     gunicorn:
       # listening options
-      bind: "unix:{{ gunicorn_socket_dir }}/gunicorn.sock"
+      bind: "unix:{{ _galaxy_gunicorn_socket_path }}"
       # performance options
       workers: 2
       # Other options that will be passed to gunicorn

vars/internal_vars.yml

@@ -7,3 +7,5 @@ _galaxy_custom_repo_clone_dest: /tmp/galaxy_load_on_deploy
 _galaxy_custom_repo_tool_location: 'tools' 
 # if using a user-supplied git repo for installing workflows, what subdirectory are the workflows in?
 _galaxy_custom_repo_workflow_location: 'workflows'
+_galaxy_gunicorn_socket_dir: "{{ _src_galaxy_root}}/run"
+_galaxy_gunicorn_socket_path: "{{ _galaxy_gunicorn_socket_dir }}/gunicorn.sock"