Merge branch 'main' into feature/multipart-hpctests2

Author: sjpb

ansible/bootstrap.yml

@@ -74,6 +74,20 @@
     - import_role:
         name: fail2ban
 
+- name: Setup podman
+  hosts: podman
+  tags: podman
+  tasks:
+    - import_role:
+        name: podman
+        tasks_from: prereqs.yml
+      tags: prereqs
+
+    - import_role:
+        name: podman
+        tasks_from: config.yml
+      tags: config
+
 - hosts: update
   gather_facts: false
   become: yes

ansible/monitoring.yml

@@ -1,20 +1,6 @@
 # ---
 # # NOTE: Requires slurmdbd
 
-- name: Setup podman
-  hosts: podman
-  tags: podman
-  tasks:
-    - import_role:
-        name: podman
-        tasks_from: prereqs.yml
-      tags: prereqs
-
-    - import_role:
-        name: podman
-        tasks_from: config.yml
-      tags: config
-
 - name: Setup elasticsearch
   hosts: opendistro
   tags: opendistro

ansible/roles/mysql/tasks/configure.yml

@@ -24,7 +24,7 @@
     # no_log: true # TODO: FIXME
     register: _mysql_info
     until: "'version' in _mysql_info"
-    retries: 60
+    retries: 90
     delay: 2
 
   - name: Ensure mysql databases created

ansible/roles/mysql/templates/mysql.service.j2

@@ -13,6 +13,7 @@ Restart=always
 EnvironmentFile=/etc/sysconfig/mysqld
 # The above EnvironmentFile must define MYSQL_INITIAL_ROOT_PASSWORD
 ExecStartPre=+install -d -o {{ mysql_podman_user }} -g {{ mysql_podman_user }} -Z container_file_t {{ mysql_datadir }}
+ExecStartPre=+chown -R {{ mysql_podman_user }}:{{ mysql_podman_user }} {{ mysql_datadir }}
 ExecStart=/usr/bin/podman run \
     --network slirp4netns:cidr={{ podman_cidr }} \
     --sdnotify=conmon --cgroups=no-conmon \

ansible/roles/opendistro/templates/opendistro.service.j2

@@ -10,6 +10,7 @@ After=network-online.target
 Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=always
 ExecStartPre=+install -d -o {{ opendistro_podman_user }} -g {{ opendistro_podman_user }} -Z container_file_t {{ opendistro_data_path }}
+ExecStartPre=+chown -R {{ opendistro_podman_user }}:{{ opendistro_podman_user }} {{ opendistro_data_path }}
 ExecStart=/usr/bin/podman run \
     --network slirp4netns:cidr={{ podman_cidr }} \
     --sdnotify=conmon --cgroups=no-conmon \