Rename pg_data_mount variables to postgresql_data_dir_mount

Replaces all instances of pg_data_mount_path and pg_data_mount_fstype with postgresql_data_dir_mount_path and postgresql_data_dir_mount_fstype across playbooks, roles, and UI code for consistency and clarity in variable naming.

Author: vitabaks

automation/playbooks/remove_cluster.yml

@@ -29,7 +29,7 @@
             default_postgresql_cluster_name: "{{ 'main' if ansible_os_family == 'Debian' else 'data' }}"
             default_postgresql_data_dir: "\
               {% if cloud_provider | default('') | length > 0 %}\
-              {{ pg_data_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
+              {{ postgresql_data_dir_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% else %}\
               {{ default_postgresql_home_dir }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% endif %}"

automation/playbooks/remove_node.yml

@@ -89,7 +89,7 @@
             default_postgresql_cluster_name: "{{ 'main' if ansible_os_family == 'Debian' else 'data' }}"
             default_postgresql_data_dir: "\
               {% if cloud_provider | default('') | length > 0 %}\
-              {{ pg_data_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
+              {{ postgresql_data_dir_mount_path | default('/pgdata') }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% else %}\
               {{ default_postgresql_home_dir }}/{{ default_postgresql_version }}/{{ default_postgresql_cluster_name }}\
               {% endif %}"

automation/roles/common/defaults/main.yml

@@ -259,7 +259,7 @@ postgresql_home_dir: "{{ '/var/lib/postgresql' if ansible_os_family == 'Debian'
 # You can specify custom data dir path. Example: "/pgdata/{{ postgresql_version }}/main"
 postgresql_data_dir: "\
   {% if cloud_provider | default('') | length > 0 %}\
-  {{ pg_data_mount_path | default('/pgdata') }}/{{ postgresql_version }}/{{ postgresql_cluster_name }}\
+  {{ postgresql_data_dir_mount_path | default('/pgdata') }}/{{ postgresql_version }}/{{ postgresql_cluster_name }}\
   {% else %}\
   {{ postgresql_home_dir }}/{{ postgresql_version }}/{{ postgresql_cluster_name }}\
   {% endif %}"

automation/roles/mount/README.md

@@ -14,8 +14,8 @@ This role configures filesystems and mount points:
 | mount[].fstype | "ext4" | Filesystem type (e.q., ext4, xfs). Use "zfs" to create a zpool and mount it. |
 | mount[].opts | "defaults,noatime" | Mount options (not applicable to zfs creation). |
 | mount[].state | "mounted" | Desired state (mounted, present, absent, etc.). |
-| pg_data_mount_path | "/pgdata" | Default path used when auto-provisioning or for the ZFS mountpoint. |
-| pg_data_mount_fstype | "ext4" | Filesystem type to create when auto-provisioning the first disk. Set to "zfs" to create a zpool. |
+| postgresql_data_dir_mount_path | "/pgdata" | Default path used when auto-provisioning or for the ZFS mountpoint. |
+| postgresql_data_dir_mount_fstype | "ext4" | Filesystem type to create when auto-provisioning the first disk. Set to "zfs" to create a zpool. |
 
 Notes:
 - The role relies on lsblk and jq for disk detection; ensure jq is available (it is installed by the common role by default).

automation/roles/mount/tasks/main.yml

@@ -26,14 +26,14 @@
       when: lsblk_disk.stdout is defined and lsblk_disk.stdout | length < 1
 
     # Filesystem
-    - name: Create "{{ pg_data_mount_fstype | default('ext4') }}" filesystem on the disk "/dev/{{ lsblk_disk.stdout | default('') }}"
+    - name: Create "{{ postgresql_data_dir_mount_fstype | default('ext4') }}" filesystem on the disk "/dev/{{ lsblk_disk.stdout | default('') }}"
       community.general.filesystem:
         dev: "/dev/{{ lsblk_disk.stdout }}"
-        fstype: "{{ pg_data_mount_fstype | default('ext4') }}"
+        fstype: "{{ postgresql_data_dir_mount_fstype | default('ext4') }}"
       when:
         - (lsblk_disk.stdout is defined and lsblk_disk.stdout | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype != 'zfs') or
-          (pg_data_mount_fstype is not defined and mount[0].fstype != 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype != 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and mount[0].fstype != 'zfs'))
 
     # UUID
     - name: Get UUID of the disk "/dev/{{ lsblk_disk.stdout | default('') }}"
@@ -46,30 +46,30 @@
       changed_when: false
       when:
         - (lsblk_disk.stdout is defined and lsblk_disk.stdout | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype != 'zfs') or
-          (pg_data_mount_fstype is not defined and mount[0].fstype != 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype != 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and mount[0].fstype != 'zfs'))
 
     - name: "Set mount variables"
       ansible.builtin.set_fact:
         mount:
           - src: "UUID={{ lsblk_uuid.stdout }}"
-            path: "{{ pg_data_mount_path | default('/pgdata', true) }}"
-            fstype: "{{ pg_data_mount_fstype | default('ext4', true) }}"
+            path: "{{ postgresql_data_dir_mount_path | default('/pgdata', true) }}"
+            fstype: "{{ postgresql_data_dir_mount_fstype | default('ext4', true) }}"
       when: lsblk_uuid.stdout is defined
 
     # Mount
     - name: Mount the filesystem
       ansible.posix.mount:
         path: "{{ item.path }}"
         src: "{{ item.src }}"
-        fstype: "{{ item.fstype | default(pg_data_mount_fstype | default('ext4', true), true) }}"
+        fstype: "{{ item.fstype | default(postgresql_data_dir_mount_fstype | default('ext4', true), true) }}"
         opts: "{{ item.opts | default('defaults,noatime') }}"
         state: "{{ item.state | default('mounted') }}"
       loop: "{{ mount }}"
       when:
         - (item.src | length > 0 and item.path | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype != 'zfs') or
-          (pg_data_mount_fstype is not defined and item.fstype != 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype != 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and item.fstype != 'zfs'))
 
     # ZFS Pool (if fstype is 'zfs')
     - block:
@@ -150,10 +150,10 @@
             -O atime=off
             -O recordsize=128k
             -O logbias=throughput
-            -m {{ pg_data_mount_path | default(mount[0].path | default('/pgdata', true), true) }}
+            -m {{ postgresql_data_dir_mount_path | default(mount[0].path | default('/pgdata', true), true) }}
             pgdata {{ mount[0].src | default("/dev/" + lsblk_disk.stdout, true) }}
       when:
         - (mount[0].src | length > 0 or lsblk_disk.stdout | default('') | length > 0)
-        - ((pg_data_mount_fstype is defined and pg_data_mount_fstype == 'zfs') or
-          (pg_data_mount_fstype is not defined and mount[0].fstype == 'zfs'))
+        - ((postgresql_data_dir_mount_fstype is defined and postgresql_data_dir_mount_fstype == 'zfs') or
+          (postgresql_data_dir_mount_fstype is not defined and mount[0].fstype == 'zfs'))
   tags: mount, zpool

console/ui/src/shared/lib/clusterValuesTransformFunctions.ts

@@ -70,7 +70,7 @@ export const getCloudProviderExtraVars = (values: ClusterFormValues) => ({
   ...values[CLUSTER_FORM_FIELD_NAMES.REGION_CONFIG].cloud_image.image,
   ...(IS_EXPERT_MODE
     ? {
-        pg_data_mount_fstype: values[STORAGE_BLOCK_FIELDS.FILE_SYSTEM_TYPE],
+        postgresql_data_dir_mount_fstype: values[STORAGE_BLOCK_FIELDS.FILE_SYSTEM_TYPE],
         volume_type: values[STORAGE_BLOCK_FIELDS.VOLUME_TYPE],
         database_public_access: !!values?.[ADDITIONAL_SETTINGS_BLOCK_FIELD_NAMES.IS_DB_PUBLIC_ACCESS],
         cloud_load_balancer: !!values?.[ADDITIONAL_SETTINGS_BLOCK_FIELD_NAMES.IS_CLOUD_LOAD_BALANCER],