feat: Support multiple volumes on virtual machines

press/playbooks/database.yml

@@ -7,6 +7,7 @@
   roles:
     - role: essentials
     - role: user
+    - role: mount
     - role: mariadb
     - role: nginx
     - role: agent

press/playbooks/mount.yml

@@ -0,0 +1,8 @@
+---
+- name: Mount Volumes
+  hosts: all
+  become: yes
+  become_user: root
+  gather_facts: no
+  roles:
+    - role: mount

press/playbooks/roles/agent/tasks/main.yml

@@ -19,7 +19,7 @@
 - name: Generate Agent Configuration File
   become: yes
   become_user: frappe
-  command: '/home/frappe/agent/env/bin/agent setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined %}--proxy-ip {{ proxy_ip }}{% endif %} {% if agent_sentry_dsn is defined and agent_sentry_dsn is truthy %}--sentry-dsn {{ agent_sentry_dsn }}{% endif %}'
+  command: '/home/frappe/agent/env/bin/agent setup config --name {{ server }} --workers {{ workers }} {% if proxy_ip is defined and proxy_ip is truthy %}--proxy-ip {{ proxy_ip }}{% endif %} {% if agent_sentry_dsn is defined and agent_sentry_dsn is truthy %}--sentry-dsn {{ agent_sentry_dsn }}{% endif %}'
   args:
     chdir: /home/frappe/agent
 

press/playbooks/roles/docker/tasks/main.yml

@@ -54,8 +54,27 @@
     src: daemon.json
     dest: /etc/docker/daemon.json
 
+- name: Create Docker SystemD drop-in directory
+  file:
+    dest: /etc/systemd/system/docker.service.d
+    state: directory
+    owner: root
+    group: root
+    mode: 0644
+    recurse: true
+
+- name: Set Docker to depend on Mounts
+  template:
+    src: mounts.conf
+    dest: /etc/systemd/system/docker.service.d/mounts.conf
+    owner: root
+    group: root
+    mode: 0644
+  when: docker_depends_on_mounts | default(false) | bool
+
 - name: Restart Docker Daemon
   systemd:
+    daemon_reload: true
     name: docker
     state: restarted
 

press/playbooks/roles/docker/templates/mounts.conf

@@ -0,0 +1,14 @@
+[Unit]
+# If Docker gets activated, then the mount will be activated as well.
+# If the mount fails to activate, Docker will not be started.
+# If the mount is explicitly stopped (or restarted), Docker will be stopped (or restarted).
+
+# BindsTo imposes a stronger condition than RequiresTo.
+# If the mount is stopped, Docker will be stopped too.
+
+# When used in conjunction with After
+# The mount strictly has to be in active state for Docker to also be in active state.
+# Reference: https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#BindsTo=
+
+After=home-frappe-benches.mount
+BindsTo=home-frappe-benches.mount

press/playbooks/roles/mariadb/tasks/main.yml

@@ -65,6 +65,15 @@
     insertafter: '\[Service\]'
     state: present
 
+- name: Set MariaDB to depend on Mounts
+  template:
+    src: mounts.conf
+    dest: /etc/systemd/system/mariadb.service.d/mounts.conf
+    owner: root
+    group: root
+    mode: 0644
+  when: mariadb_depends_on_mounts | default(false) | bool
+
 - name: Restart MariaDB Service
   systemd:
     daemon_reload: true

press/playbooks/roles/mariadb/templates/mounts.conf

@@ -0,0 +1,14 @@
+[Unit]
+# If MariaDB gets activated, then mounts will be activated as well.
+# If one of the mounts fails to activate, MariaDB will not be started.
+# If one of the mounts is explicitly stopped (or restarted), MariaDB will be stopped (or restarted).
+
+# BindsTo imposes a stronger condition than RequiresTo.
+# If one of the mounts are stopped, MariaDB will be stopped too.
+
+# When used in conjunction with After
+# The mounts strictly have to be in active state for MariaDB to also be in active state.
+# Reference: https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#BindsTo=
+
+After=etc-mysql.mount var-lib-mysql.mount
+BindsTo=etc-mysql.mount var-lib-mysql.mount

press/playbooks/roles/mount/tasks/main.yml

@@ -0,0 +1,55 @@
+---
+- name: Set JSON Variables
+  set_fact:
+    all_mounts: '{{ all_mounts_json | from_json }}'
+    volume_mounts: '{{ volume_mounts_json | from_json }}'
+    bind_mounts: '{{ bind_mounts_json | from_json }}'
+
+- name: Create Mount Points
+  file:
+    dest: "{{ item.mount_point }}"
+    state: directory
+    owner: "{{ item.mount_point_owner }}"
+    group: "{{ item.mount_point_group }}"
+    mode: "{{ item.mount_point_mode }}"
+  loop: "{{ all_mounts }}"
+
+- name: Format Volumes
+  filesystem:
+    fstype: "{{ item.filesystem }}"
+    dev: "{{ item.source }}"
+    force: false
+  loop: "{{ volume_mounts }}"
+
+- name: Show Block Device UUIDs
+  command: 'lsblk {{ item.source }} -no UUID'
+  loop: "{{ volume_mounts }}"
+  register: block_devices
+
+- name: Mount Volumes
+  mount:
+    src: "UUID={{ item.stdout.strip() }}"
+    path: "{{ item.item.mount_point }}"
+    fstype: "{{ item.item.filesystem }}"
+    opts: "{{ item.item.mount_options }}"
+    state: mounted
+  loop: "{{ block_devices.results }}"
+
+- name: Create Mount Source Directories
+  file:
+    dest: "{{ item.source }}"
+    state: directory
+    owner: "{{ item.mount_point_owner }}"
+    group: "{{ item.mount_point_group }}"
+    mode: "{{ item.mount_point_mode }}"
+  loop: "{{ bind_mounts }}"
+
+- name: Mount Bind Mounts
+  mount:
+    src: "{{ item.source }}"
+    path: "{{ item.mount_point }}"
+    fstype: none
+    opts: "{{ item.mount_options }}"
+    state: mounted
+  loop: "{{ bind_mounts }}"
+

press/playbooks/server.yml

@@ -9,6 +9,7 @@
     - role: user
     - role: nginx
     - role: agent
+    - role: mount
     - role: bench
     - role: docker
     - role: node_exporter

press/press/doctype/ansible_play/ansible_play.js

@@ -2,6 +2,19 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Ansible Play', {
-	// refresh: function(frm) {
-	// }
+	refresh: function (frm) {
+		frappe.realtime.on('ansible_play_progress', (data) => {
+			if (data.progress && data.play === frm.doc.name) {
+				const progress_title = __('Ansible Play Progress');
+				frm.dashboard.show_progress(
+					progress_title,
+					(data.progress / data.total) * 100,
+					`Ansible Play Progress (${data.progress} tasks completed out of ${data.total})`,
+				);
+				if (data.progress === data.total) {
+					frm.dashboard.hide_progress(progress_title);
+				}
+			}
+		});
+	},
 });

press/press/doctype/database_server/database_server.js

@@ -154,6 +154,12 @@ frappe.ui.form.on('Database Server', {
 				true,
 				frm.doc.is_self_hosted,
 			],
+			[
+				__('Mount Volumes'),
+				'mount_volumes',
+				true,
+				frm.doc.virtual_machine && frm.doc.mounts,
+			],
 		].forEach(([label, method, confirm, condition]) => {
 			if (typeof condition === 'undefined' || condition) {
 				frm.add_custom_button(

press/press/doctype/database_server/database_server.json

@@ -54,6 +54,8 @@
   "column_break_apox",
   "tags_section",
   "tags",
+  "mounts_section",
+  "mounts",
   "mariadb_settings_tab",
   "memory_limits_section",
   "memory_high",
@@ -517,11 +519,22 @@
    "fieldtype": "Int",
    "label": "Auto Add Storage Max",
    "non_negative": 1
+  },
+  {
+   "fieldname": "mounts_section",
+   "fieldtype": "Section Break",
+   "label": "Mounts"
+  },
+  {
+   "fieldname": "mounts",
+   "fieldtype": "Table",
+   "label": "Mounts",
+   "options": "Server Mount"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-08-13 11:02:07.399141",
+ "modified": "2024-10-28 18:05:38.289733",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Database Server",