|
 |
d75841 |
From ba8a97039805f488c26b4d857f0137a349359c23 Mon Sep 17 00:00:00 2001
|
|
|
d75841 |
From: Richard Megginson <rmeggins@redhat.com>
|
|
|
d75841 |
Date: Mon, 16 May 2022 07:51:43 -0600
|
|
|
d75841 |
Subject: [PATCH] add support for mount_options (#270)
|
|
|
d75841 |
|
|
|
d75841 |
* add support for mount_options
|
|
|
d75841 |
|
|
|
d75841 |
When support for argument validation was added, that support did not
|
|
|
d75841 |
include the `mount_options` parameter. This fix adds back that
|
|
|
d75841 |
parameter. In addition, the volume module arguments are refactored
|
|
|
d75841 |
so that the common volume parameters such as `mount_options` can be
|
|
|
d75841 |
specified in one place.
|
|
|
d75841 |
|
|
|
d75841 |
This adds a test for the `mount_options` parameter, and adds
|
|
|
d75841 |
verification for that parameter.
|
|
|
d75841 |
|
|
|
d75841 |
* only checkout mount_options if requested
|
|
|
d75841 |
|
|
|
d75841 |
(cherry picked from commit ecf3d04bb704db5c1a095aaef40c2372fd45d4d6)
|
|
|
d75841 |
---
|
|
|
d75841 |
library/blivet.py | 78 ++++++++++++++----------------
|
|
|
d75841 |
tests/test-verify-volume-fstab.yml | 22 ++++++++-
|
|
|
d75841 |
tests/tests_misc.yml | 3 ++
|
|
|
d75841 |
3 files changed, 60 insertions(+), 43 deletions(-)
|
|
|
d75841 |
|
|
|
d75841 |
diff --git a/library/blivet.py b/library/blivet.py
|
|
|
d75841 |
index 80575bb..29552fa 100644
|
|
|
d75841 |
--- a/library/blivet.py
|
|
|
d75841 |
+++ b/library/blivet.py
|
|
|
d75841 |
@@ -105,6 +105,7 @@ volumes:
|
|
|
d75841 |
elements: dict
|
|
|
d75841 |
'''
|
|
|
d75841 |
|
|
|
d75841 |
+import copy
|
|
|
d75841 |
import logging
|
|
|
d75841 |
import os
|
|
|
d75841 |
import traceback
|
|
|
d75841 |
@@ -1500,6 +1501,39 @@ def activate_swaps(b, pools, volumes):
|
|
|
d75841 |
|
|
|
d75841 |
def run_module():
|
|
|
d75841 |
# available arguments/parameters that a user can pass
|
|
|
d75841 |
+ common_volume_opts = dict(encryption=dict(type='bool'),
|
|
|
d75841 |
+ encryption_cipher=dict(type='str'),
|
|
|
d75841 |
+ encryption_key=dict(type='str'),
|
|
|
d75841 |
+ encryption_key_size=dict(type='int'),
|
|
|
d75841 |
+ encryption_luks_version=dict(type='str'),
|
|
|
d75841 |
+ encryption_password=dict(type='str'),
|
|
|
d75841 |
+ fs_create_options=dict(type='str'),
|
|
|
d75841 |
+ fs_label=dict(type='str', default=''),
|
|
|
d75841 |
+ fs_type=dict(type='str'),
|
|
|
d75841 |
+ mount_options=dict(type='str'),
|
|
|
d75841 |
+ mount_point=dict(type='str'),
|
|
|
d75841 |
+ name=dict(type='str'),
|
|
|
d75841 |
+ raid_level=dict(type='str'),
|
|
|
d75841 |
+ size=dict(type='str'),
|
|
|
d75841 |
+ state=dict(type='str', default='present', choices=['present', 'absent']),
|
|
|
d75841 |
+ type=dict(type='str'))
|
|
|
d75841 |
+ volume_opts = copy.deepcopy(common_volume_opts)
|
|
|
d75841 |
+ volume_opts.update(
|
|
|
d75841 |
+ dict(disks=dict(type='list'),
|
|
|
d75841 |
+ raid_device_count=dict(type='int'),
|
|
|
d75841 |
+ raid_spare_count=dict(type='int'),
|
|
|
d75841 |
+ raid_metadata_version=dict(type='str')))
|
|
|
d75841 |
+ pool_volume_opts = copy.deepcopy(common_volume_opts)
|
|
|
d75841 |
+ pool_volume_opts.update(
|
|
|
d75841 |
+ dict(cached=dict(type='bool'),
|
|
|
d75841 |
+ cache_devices=dict(type='list', elements='str', default=list()),
|
|
|
d75841 |
+ cache_mode=dict(type='str'),
|
|
|
d75841 |
+ cache_size=dict(type='str'),
|
|
|
d75841 |
+ compression=dict(type='bool'),
|
|
|
d75841 |
+ deduplication=dict(type='bool'),
|
|
|
d75841 |
+ raid_disks=dict(type='list', elements='str', default=list()),
|
|
|
d75841 |
+ vdo_pool_size=dict(type='str')))
|
|
|
d75841 |
+
|
|
|
d75841 |
module_args = dict(
|
|
|
d75841 |
pools=dict(type='list', elements='dict',
|
|
|
d75841 |
options=dict(disks=dict(type='list', elements='str', default=list()),
|
|
|
d75841 |
@@ -1517,49 +1551,9 @@ def run_module():
|
|
|
d75841 |
state=dict(type='str', default='present', choices=['present', 'absent']),
|
|
|
d75841 |
type=dict(type='str'),
|
|
|
d75841 |
volumes=dict(type='list', elements='dict', default=list(),
|
|
|
d75841 |
- options=dict(cached=dict(type='bool'),
|
|
|
d75841 |
- cache_devices=dict(type='list', elements='str', default=list()),
|
|
|
d75841 |
- cache_mode=dict(type='str'),
|
|
|
d75841 |
- cache_size=dict(type='str'),
|
|
|
d75841 |
- compression=dict(type='bool'),
|
|
|
d75841 |
- deduplication=dict(type='bool'),
|
|
|
d75841 |
- encryption=dict(type='bool'),
|
|
|
d75841 |
- encryption_cipher=dict(type='str'),
|
|
|
d75841 |
- encryption_key=dict(type='str'),
|
|
|
d75841 |
- encryption_key_size=dict(type='int'),
|
|
|
d75841 |
- encryption_luks_version=dict(type='str'),
|
|
|
d75841 |
- encryption_password=dict(type='str'),
|
|
|
d75841 |
- fs_create_options=dict(type='str'),
|
|
|
d75841 |
- fs_label=dict(type='str', default=''),
|
|
|
d75841 |
- fs_type=dict(type='str'),
|
|
|
d75841 |
- mount_point=dict(type='str'),
|
|
|
d75841 |
- name=dict(type='str'),
|
|
|
d75841 |
- raid_disks=dict(type='list', elements='str', default=list()),
|
|
|
d75841 |
- raid_level=dict(type='str'),
|
|
|
d75841 |
- size=dict(type='str'),
|
|
|
d75841 |
- state=dict(type='str', default='present', choices=['present', 'absent']),
|
|
|
d75841 |
- type=dict(type='str'),
|
|
|
d75841 |
- vdo_pool_size=dict(type='str'))))),
|
|
|
d75841 |
+ options=pool_volume_opts))),
|
|
|
d75841 |
volumes=dict(type='list', elements='dict',
|
|
|
d75841 |
- options=dict(disks=dict(type='list'),
|
|
|
d75841 |
- encryption=dict(type='bool'),
|
|
|
d75841 |
- encryption_cipher=dict(type='str'),
|
|
|
d75841 |
- encryption_key=dict(type='str'),
|
|
|
d75841 |
- encryption_key_size=dict(type='int'),
|
|
|
d75841 |
- encryption_luks_version=dict(type='str'),
|
|
|
d75841 |
- encryption_password=dict(type='str'),
|
|
|
d75841 |
- fs_create_options=dict(type='str'),
|
|
|
d75841 |
- fs_label=dict(type='str', default=''),
|
|
|
d75841 |
- fs_type=dict(type='str'),
|
|
|
d75841 |
- mount_point=dict(type='str'),
|
|
|
d75841 |
- name=dict(type='str'),
|
|
|
d75841 |
- raid_level=dict(type='str'),
|
|
|
d75841 |
- raid_device_count=dict(type='int'),
|
|
|
d75841 |
- raid_spare_count=dict(type='int'),
|
|
|
d75841 |
- raid_metadata_version=dict(type='str'),
|
|
|
d75841 |
- size=dict(type='str'),
|
|
|
d75841 |
- state=dict(type='str', default='present', choices=['present', 'absent']),
|
|
|
d75841 |
- type=dict(type='str'))),
|
|
|
d75841 |
+ options=volume_opts),
|
|
|
d75841 |
packages_only=dict(type='bool', required=False, default=False),
|
|
|
d75841 |
disklabel_type=dict(type='str', required=False, default=None),
|
|
|
d75841 |
safe_mode=dict(type='bool', required=False, default=True),
|
|
|
d75841 |
diff --git a/tests/test-verify-volume-fstab.yml b/tests/test-verify-volume-fstab.yml
|
|
|
d75841 |
index 80d78f0..0091084 100644
|
|
|
d75841 |
--- a/tests/test-verify-volume-fstab.yml
|
|
|
d75841 |
+++ b/tests/test-verify-volume-fstab.yml
|
|
|
d75841 |
@@ -11,6 +11,15 @@
|
|
|
d75841 |
storage_test_fstab_expected_mount_point_matches: "{{ 1
|
|
|
d75841 |
if (_storage_test_volume_present and storage_test_volume.mount_point and storage_test_volume.mount_point.startswith('/'))
|
|
|
d75841 |
else 0 }}"
|
|
|
d75841 |
+ storage_test_fstab_mount_options_matches: "{{ storage_test_fstab.stdout_lines |
|
|
|
d75841 |
+ map('regex_search', ' ' + storage_test_volume.mount_point + ' .* ' + storage_test_volume.mount_options + ' +') |
|
|
|
d75841 |
+ select('string')|list if (
|
|
|
d75841 |
+ storage_test_volume.mount_options|d('none',true) != 'none'
|
|
|
d75841 |
+ and storage_test_volume.mount_point|d('none',true) != 'none'
|
|
|
d75841 |
+ ) else [] }}"
|
|
|
d75841 |
+ storage_test_fstab_expected_mount_options_matches: "{{ 1
|
|
|
d75841 |
+ if (_storage_test_volume_present and storage_test_volume.mount_options)
|
|
|
d75841 |
+ else 0 }}"
|
|
|
d75841 |
|
|
|
d75841 |
# device id
|
|
|
d75841 |
- name: Verify that the device identifier appears in /etc/fstab
|
|
|
d75841 |
@@ -26,7 +35,16 @@
|
|
|
d75841 |
msg: "Expected number ({{ storage_test_fstab_expected_mount_point_matches }}) of
|
|
|
d75841 |
entries with volume '{{ storage_test_volume.name }}' mount point not found in /etc/fstab."
|
|
|
d75841 |
|
|
|
d75841 |
-# todo: options
|
|
|
d75841 |
+# mount options
|
|
|
d75841 |
+- name: Verify mount_options
|
|
|
d75841 |
+ assert:
|
|
|
d75841 |
+ that: storage_test_fstab_mount_options_matches|length == storage_test_fstab_expected_mount_options_matches|int
|
|
|
d75841 |
+ msg: "Expected number ({{ storage_test_fstab_expected_mount_options_matches }}) of
|
|
|
d75841 |
+ entries with volume '{{ storage_test_volume.name }}' mount options not found in /etc/fstab."
|
|
|
d75841 |
+ when:
|
|
|
d75841 |
+ - __storage_verify_mount_options | d(false)
|
|
|
d75841 |
+ - "'mount_options' in storage_test_volume"
|
|
|
d75841 |
+ - "'mount_point' in storage_test_volume"
|
|
|
d75841 |
|
|
|
d75841 |
- name: Clean up variables
|
|
|
d75841 |
set_fact:
|
|
|
d75841 |
@@ -34,3 +52,5 @@
|
|
|
d75841 |
storage_test_fstab_mount_point_matches: null
|
|
|
d75841 |
storage_test_fstab_expected_id_matches: null
|
|
|
d75841 |
storage_test_fstab_expected_mount_point_matches: null
|
|
|
d75841 |
+ storage_test_fstab_mount_options_matches: null
|
|
|
d75841 |
+ storage_test_fstab_expected_mount_options_matches: null
|
|
|
d75841 |
diff --git a/tests/tests_misc.yml b/tests/tests_misc.yml
|
|
|
d75841 |
index 159c959..97c1627 100644
|
|
|
d75841 |
--- a/tests/tests_misc.yml
|
|
|
d75841 |
+++ b/tests/tests_misc.yml
|
|
|
d75841 |
@@ -189,8 +189,11 @@
|
|
|
d75841 |
fs_type: 'ext4'
|
|
|
d75841 |
fs_create_options: '-F'
|
|
|
d75841 |
mount_point: "{{ mount_location }}"
|
|
|
d75841 |
+ mount_options: rw,noatime,defaults
|
|
|
d75841 |
|
|
|
d75841 |
- include_tasks: verify-role-results.yml
|
|
|
d75841 |
+ vars:
|
|
|
d75841 |
+ __storage_verify_mount_options: true
|
|
|
d75841 |
|
|
|
d75841 |
- name: Remove the disk volume created above
|
|
|
d75841 |
include_role:
|
|
|
d75841 |
--
|
|
|
d75841 |
2.35.3
|
|
|
d75841 |
|