Merge pull request openstack-k8s-operators#721 from mrkisaolamb/fix_d…

…efault_group Fix default hugepages group
vakwetu · Aug 5, 2024 · 27a6d7f · 27a6d7f
2 parents 8bab377 + 436c321
commit 27a6d7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/roles/edpm_extra_mounts/defaults/main.yml b/roles/edpm_extra_mounts/defaults/main.yml
@@ -23,5 +23,5 @@ edpm_extra_mounts_hide_sensitive_logs: true
 
 edpm_extra_mounts: []
 edpm_default_mounts: [
-  {name: 'hugepages1G', path: '/dev/hugepages1G', opts: 'pagesize=1G', fstype: 'hugetlbfs'},
-  {name: 'hugepages2M', path: /dev/hugepages2M, opts: 'pagesize=2M', fstype: 'hugetlbfs'}]
+  {name: 'hugepages1G', path: '/dev/hugepages1G', opts: 'pagesize=1G', fstype: 'hugetlbfs', group: 'hugetlbfs'},
+  {name: 'hugepages2M', path: /dev/hugepages2M, opts: 'pagesize=2M', fstype: 'hugetlbfs', group: 'hugetlbfs'}]
diff --git a/roles/edpm_extra_mounts/molecule/default/converge.yml b/roles/edpm_extra_mounts/molecule/default/converge.yml
@@ -18,6 +18,13 @@
 - name: Converge
   hosts: all
   tasks:
+    - name: "Include edpm_users with non default config"
+      ansible.builtin.include_role:
+        name: "osp.edpm.edpm_users"
+      vars:
+        edpm_users_users:
+          - {"name": "hugetlbfs", "gid": "42477", "group_only": true}
+        edpm_users_extra_dirs: []
     - name: "Include edpm_extra_mounts"
       ansible.builtin.include_role:
         name: "osp.edpm.edpm_extra_mounts"
@@ -29,7 +36,9 @@
             path: '/dev/hugepages1G'
             opts: 'pagesize=1G'
             fstype: 'hugetlbfs'
+            group: 'hugetlbfs'
           - name: 'hugepages2MB'
             path: '/dev/hugepages2MB'
             opts: 'pagesize=2M'
             fstype: 'hugetlbfs'
+            group: 'hugetlbfs'