From 9332b958fa1296c250340c6e372dd5a741f496af Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczepanek <100217377+szczepax@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:25:53 +0200
Subject: [PATCH 1/2] FEAT: add fstab entry for pmem mount

common: add fstab entry for pmem mount
---
 utils/ansible/configure-pmem.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/utils/ansible/configure-pmem.yml b/utils/ansible/configure-pmem.yml
index 00545c4d657..22fca4dafeb 100644
--- a/utils/ansible/configure-pmem.yml
+++ b/utils/ansible/configure-pmem.yml
@@ -123,7 +123,7 @@
         fi
 
         sudo mkfs.ext4 -F /dev/${pmem_name}
-        sudo mount -o dax /dev/${pmem_name} ${MOUNT_POINT}
+        sudo mount -o dax=always /dev/${pmem_name} ${MOUNT_POINT}
         sudo chown -R {{ testUser }} ${MOUNT_POINT}
 
         sudo chmod 777 /dev/dax* || true
@@ -133,3 +133,17 @@
       register: script
 
     - debug: var=script
+
+    - name: Get PMEM device name for /dev/pmem0 mount point
+      shell: |
+        mount | sed -nr "s/^.*(\/dev\/\S+) on \/mnt\/pmem0.*$/\1/p"
+      register: pmem_name
+
+    - name: Add /etc/fstab entry for PMEM
+      ansible.posix.mount:
+        path: /mnt/pmem0
+        src: "{{ pmem_name.stdout }}"
+        fstype: ext4
+        opts: rw,relatime,dax=always
+        state: present
+        backup: true

From 4d67cd663b1b2992acb4a96a3de91c7b0ca6d425 Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczepanek <100217377+szczepax@users.noreply.github.com>
Date: Wed, 18 Oct 2023 14:20:57 +0200
Subject: [PATCH 2/2] Move mount point to ansible vars, add initial fstab entry
 remove

---
 utils/ansible/configure-pmem.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/utils/ansible/configure-pmem.yml b/utils/ansible/configure-pmem.yml
index 22fca4dafeb..6390487ec20 100644
--- a/utils/ansible/configure-pmem.yml
+++ b/utils/ansible/configure-pmem.yml
@@ -29,11 +29,18 @@
   vars:
     newRegions: false
     testUser: pmdkuser
+    mountPoint: /mnt/pmem0
 
   tasks:
     - name: "Test if ndctl is installed"
       shell: which ndctl
 
+    - name: "Remove fstab entry if it exist"
+      ansible.posix.mount:
+        path: "{{ mountPoint }}"
+        state: absent_from_fstab
+        backup: true
+
     - name: "Unmount namespaces if they exist"
       shell: sudo umount /dev/pmem* || true
 
@@ -64,7 +71,6 @@
         #!/usr/bin/env bash
         DEV_DAX_R=0x0000
         FS_DAX_R=0x0001
-        MOUNT_POINT="/mnt/pmem0"
 
         function check_alignment() {
           local size=$1
@@ -118,13 +124,13 @@
 
         pmem_name=$(create_fsdax)
 
-        if [ ! -d "${MOUNT_POINT}" ]; then
-          sudo mkdir ${MOUNT_POINT}
+        if [ ! -d "{{ mountPoint }}" ]; then
+          sudo mkdir {{ mountPoint }}
         fi
 
         sudo mkfs.ext4 -F /dev/${pmem_name}
-        sudo mount -o dax=always /dev/${pmem_name} ${MOUNT_POINT}
-        sudo chown -R {{ testUser }} ${MOUNT_POINT}
+        sudo mount -o dax=always /dev/${pmem_name} {{ mountPoint }}
+        sudo chown -R {{ testUser }} {{ mountPoint }}
 
         sudo chmod 777 /dev/dax* || true
         sudo chmod a+rw /sys/bus/nd/devices/region*/deep_flush
@@ -134,14 +140,14 @@
 
     - debug: var=script
 
-    - name: Get PMEM device name for /dev/pmem0 mount point
+    - name: "Get PMEM device name for {{ mountPoint }} mount point"
       shell: |
         mount | sed -nr "s/^.*(\/dev\/\S+) on \/mnt\/pmem0.*$/\1/p"
       register: pmem_name
 
-    - name: Add /etc/fstab entry for PMEM
+    - name: "Add /etc/fstab entry for PMEM"
       ansible.posix.mount:
-        path: /mnt/pmem0
+        path: "{{ mountPoint }}"
         src: "{{ pmem_name.stdout }}"
         fstype: ext4
         opts: rw,relatime,dax=always