mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-11-21 22:50:27 +00:00
Compare commits
10
Commits
90c3bd65bf
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4daa61d294 | ||
|
|
4bd26a3cc6 | ||
|
|
0f4453f85e | ||
|
|
dddd6c9b35 | ||
|
|
d5699a3fcf | ||
|
|
2f2a8e9b96 | ||
|
|
93f25f88b8 | ||
|
|
20699d7184 | ||
|
|
7ed7d2399c | ||
|
|
035d4ad0a3 |
@@ -59,6 +59,22 @@ stages:
|
||||
- name: Lint
|
||||
test: lint
|
||||
|
||||
- stage: Sanity_2_22
|
||||
displayName: Ansible 2.22 Sanity & Units & Lint
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
nameFormat: "{0}"
|
||||
testFormat: 2.22/{0}
|
||||
targets:
|
||||
- name: Sanity
|
||||
test: sanity
|
||||
- name: Units
|
||||
test: units
|
||||
- name: Lint
|
||||
test: lint
|
||||
|
||||
- stage: Sanity_2_21
|
||||
displayName: Ansible 2.21 Sanity & Units & Lint
|
||||
dependsOn: []
|
||||
@@ -159,6 +175,8 @@ stages:
|
||||
test: lint
|
||||
|
||||
## Docker
|
||||
# Valid docker targets are located at the following path:
|
||||
# https://github.com/ansible/ansible/blob/<branch>/test/lib/ansible_test/_data/completion/docker.txt
|
||||
- stage: Docker_devel
|
||||
displayName: Docker devel
|
||||
dependsOn: []
|
||||
@@ -174,6 +192,21 @@ stages:
|
||||
- name: Ubuntu 26.04
|
||||
test: ubuntu2604
|
||||
|
||||
- stage: Docker_2_22
|
||||
displayName: Docker 2.22
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
testFormat: 2.22/linux/{0}/1
|
||||
targets:
|
||||
- name: Fedora 44
|
||||
test: fedora44
|
||||
- name: Ubuntu 24.04
|
||||
test: ubuntu2404
|
||||
- name: Ubuntu 26.04
|
||||
test: ubuntu2604
|
||||
|
||||
- stage: Docker_2_21
|
||||
displayName: Docker 2.21
|
||||
dependsOn: []
|
||||
@@ -263,6 +296,8 @@ stages:
|
||||
test: ubuntu2204
|
||||
|
||||
## Remote
|
||||
# Valid remote targets are located at the following path:
|
||||
# https://github.com/ansible/ansible/blob/<branch>/test/lib/ansible_test/_data/completion/remote.txt
|
||||
- stage: Remote_devel
|
||||
displayName: Remote devel
|
||||
dependsOn: []
|
||||
@@ -270,13 +305,28 @@ stages:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
testFormat: devel/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: FreeBSD 14.5
|
||||
test: freebsd/14.5
|
||||
- name: FreeBSD 15.1
|
||||
test: freebsd/15.1
|
||||
|
||||
- stage: Remote_2_22
|
||||
displayName: Remote 2.22
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
testFormat: 2.22/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: RHEL 9.8
|
||||
test: rhel/9.8
|
||||
- name: FreeBSD 14.4
|
||||
test: freebsd/14.4
|
||||
- name: FreeBSD 14.5
|
||||
test: freebsd/14.5
|
||||
- name: FreeBSD 15.1
|
||||
test: freebsd/15.1
|
||||
|
||||
@@ -288,14 +338,14 @@ stages:
|
||||
parameters:
|
||||
testFormat: 2.21/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.1
|
||||
test: rhel/10.1
|
||||
- name: RHEL 9.7
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 14.4
|
||||
test: freebsd/14.4
|
||||
- name: FreeBSD 15.0
|
||||
test: freebsd/15.0
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: RHEL 9.8
|
||||
test: rhel/9.8
|
||||
- name: FreeBSD 14.5
|
||||
test: freebsd/14.5
|
||||
- name: FreeBSD 15.1
|
||||
test: freebsd/15.1
|
||||
|
||||
- stage: Remote_2_20
|
||||
displayName: Remote 2.20
|
||||
@@ -305,14 +355,12 @@ stages:
|
||||
parameters:
|
||||
testFormat: 2.20/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.1
|
||||
test: rhel/10.1
|
||||
- name: RHEL 9.7
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 14.3
|
||||
test: freebsd/14.3
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: RHEL 9.8
|
||||
test: rhel/9.8
|
||||
- name: FreeBSD 14.5
|
||||
test: freebsd/14.5
|
||||
|
||||
- stage: Remote_2_19
|
||||
displayName: Remote 2.19
|
||||
@@ -328,8 +376,6 @@ stages:
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 14.3
|
||||
test: freebsd/14.3
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
|
||||
- stage: Remote_2_18
|
||||
displayName: Remote 2.18
|
||||
@@ -339,26 +385,10 @@ stages:
|
||||
parameters:
|
||||
testFormat: 2.18/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.1
|
||||
test: rhel/10.1
|
||||
- name: RHEL 9.7
|
||||
test: rhel/9.7
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
|
||||
- stage: Remote_2_17
|
||||
displayName: Remote 2.17
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: templates/matrix.yml
|
||||
parameters:
|
||||
container: legacy
|
||||
testFormat: 2.17/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.0
|
||||
test: rhel/10.0
|
||||
- name: FreeBSD 13.5
|
||||
test: freebsd/13.5
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: RHEL 9.8
|
||||
test: rhel/9.8
|
||||
|
||||
- stage: Remote_2_16
|
||||
displayName: Remote 2.16
|
||||
@@ -369,8 +399,10 @@ stages:
|
||||
container: legacy
|
||||
testFormat: 2.16/{0}/1
|
||||
targets:
|
||||
- name: RHEL 10.1
|
||||
test: rhel/10.1
|
||||
- name: RHEL 10.2
|
||||
test: rhel/10.2
|
||||
- name: RHEL 9.8
|
||||
test: rhel/9.8
|
||||
|
||||
## Finally
|
||||
|
||||
@@ -381,7 +413,6 @@ stages:
|
||||
- Remote_2_16
|
||||
- Docker_2_16
|
||||
- Sanity_2_17
|
||||
- Remote_2_17
|
||||
- Docker_2_17
|
||||
- Sanity_2_18
|
||||
- Remote_2_18
|
||||
@@ -395,6 +426,9 @@ stages:
|
||||
- Sanity_2_21
|
||||
- Remote_2_21
|
||||
- Docker_2_21
|
||||
- Sanity_2_22
|
||||
- Remote_2_22
|
||||
- Docker_2_22
|
||||
- Sanity_devel
|
||||
- Remote_devel
|
||||
- Docker_devel
|
||||
|
||||
@@ -15,7 +15,7 @@ parameters:
|
||||
|
||||
jobs:
|
||||
- ${{ each job in parameters.jobs }}:
|
||||
- job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
|
||||
- job: test_${{ replace(replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_'), '@', '_') }}
|
||||
displayName: ${{ job.name }}
|
||||
container: ${{ parameters.container }}
|
||||
workspace:
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
# Security Policy
|
||||
|
||||
## Reporting a security vulnerability
|
||||
|
||||
All security vulnerability reports MUST be submitted by email to: [security@ansible.com](mailto:security@ansible.com)
|
||||
|
||||
Security vulnerabilities MUST NOT be reported through public channels such as GitHub issues, pull requests, the Ansible Forum, or social media.
|
||||
|
||||
## What to include
|
||||
|
||||
When submitting a vulnerability report, include the following:
|
||||
|
||||
* **Title** (required): Clear, concise, descriptive summary.
|
||||
* **Impacted project** (required): Ideally a link to the GitHub project.
|
||||
* **Reporter details** (optional): Your name or handle and affiliation.
|
||||
* **Vulnerability description** (required): Technical details of the issue.
|
||||
* **Affected versions** (required): Known affected version(s), and ideally all affected versions.
|
||||
* **Reproduction steps** (required): Minimal example to reproduce the issue.
|
||||
* **Impact assessment** (required): Potential exploit scenarios and severity.
|
||||
* **Suggested fix** (optional): Proposed remediation, if any.
|
||||
* **Disclosure status** (required): Whether this has been shared with other parties or published and your plan for future sharing (e.g., at a conference).
|
||||
|
||||
## Timeline
|
||||
|
||||
* The Ansible Security Team aims to confirm receipt of vulnerability reports within one (1) business day.
|
||||
* Our goal is to assess the report, coordinate fix and disclosure as quickly as possible.
|
||||
* All confirmed vulnerabilities are addressed according to severity and impact.
|
||||
|
||||
## Backports
|
||||
|
||||
Generally, only the latest release of this project receives security updates.
|
||||
Earlier versions may receive critical fixes on a best-effort basis.
|
||||
|
||||
## Ansible Security Policy
|
||||
|
||||
For the complete Ansible Security Policy, including what qualifies as a reportable vulnerability, severity classification, the response process, coordinated disclosure, and the vulnerability management process, see [ansible.com/security](https://ansible.com/security).
|
||||
|
||||
## EU Cyber Resilience Act: Open-Source Steward Statement
|
||||
|
||||
This project is stewarded by **Red Hat, Inc.**, an open-source software steward as defined in Article 3(14) of the [EU Cyber Resilience Act (Regulation 2024/2847)](https://eur-lex.europa.eu/eli/reg/2024/2847/oj/eng).
|
||||
|
||||
Contact: [cra-steward@redhat.com](mailto:cra-steward@redhat.com)
|
||||
@@ -78,7 +78,8 @@ ansible-doc -t callback ansible.posix.profile_tasks
|
||||
|
||||
The following ansible-core versions have been tested with this collection:
|
||||
|
||||
- ansible-core 2.22 (devel)
|
||||
- ansible-core 2.23 (devel)
|
||||
- ansible-core 2.22 (stable)
|
||||
- ansible-core 2.21 (stable)
|
||||
- ansible-core 2.20 (stable)
|
||||
- ansible-core 2.19 (stable)
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
bugfixes:
|
||||
- synchronize - fall back to ``ansible_host`` and ``ansible_password``/``ansible_ssh_pass``
|
||||
from the current host's task vars when absent from the cached ``hostvars``
|
||||
snapshot (for example when set via play-level ``vars:``), and correctly
|
||||
template ``ansible_host`` before building the rsync destination, fixing
|
||||
"Host not found" errors when ``ansible_host`` differs from
|
||||
``inventory_hostname`` (https://github.com/ansible-collections/ansible.posix/issues/469).
|
||||
@@ -0,0 +1,4 @@
|
||||
bugfixes:
|
||||
- firewalld_info - return a module failure instead of a traceback when python-firewall raises
|
||||
``FirewallError``, for example when D-Bus is unavailable
|
||||
(https://github.com/ansible-collections/ansible.posix/issues/678).
|
||||
@@ -0,0 +1,5 @@
|
||||
bugfixes:
|
||||
- synchronize - report ``changed`` correctly when ``link_dest`` is used. Previously the module
|
||||
reported no change as soon as rsync listed one unchanged file, even if other files were
|
||||
transferred, deleted or had their attributes updated
|
||||
(https://github.com/ansible-collections/ansible.posix/issues/716).
|
||||
@@ -0,0 +1,2 @@
|
||||
minor_changes:
|
||||
- "Introduce an option to remove only the mount and fstab entry but not the mountpoint (https://github.com/ansible-collections/ansible.posix/issues/331)."
|
||||
@@ -0,0 +1,3 @@
|
||||
---
|
||||
trivial:
|
||||
- Fix mount opts_no_log integration test for ansible-core 2.22 (https://github.com/ansible-collections/ansible.posix/issues/793).
|
||||
@@ -0,0 +1,4 @@
|
||||
---
|
||||
trivial:
|
||||
- CI - AZP replace FreeBSD version 14.4 with 14.5 for remote tests.
|
||||
...
|
||||
@@ -0,0 +1,5 @@
|
||||
---
|
||||
trivial:
|
||||
- CI - remove FreeBSD version 13.5 from AZP remote tests.
|
||||
- CI - use Python 3.9 on RHEL 9.8 in AZP remote devel to keep compatibility with Python firewall library.
|
||||
...
|
||||
@@ -0,0 +1,7 @@
|
||||
---
|
||||
trivial:
|
||||
- CI - Add ansible core 2.22 for AZP tests.
|
||||
- CI - Update remote OS for AZP tests.
|
||||
- CI - Remove 2.17 from AZP remote tests.
|
||||
- CI - Fix the replacement logic for AZP test job parameter.
|
||||
...
|
||||
@@ -0,0 +1,3 @@
|
||||
---
|
||||
bugfixes:
|
||||
- mount - restore fstab if umount fails (https://github.com/ansible-collections/ansible.posix/issues/605).
|
||||
@@ -240,10 +240,17 @@ class ActionModule(ActionBase):
|
||||
src_host = '127.0.0.1'
|
||||
inventory_hostname = task_vars.get('inventory_hostname')
|
||||
dest_host_inventory_vars = task_vars['hostvars'].get(inventory_hostname)
|
||||
dest_host = dest_host_inventory_vars.get('ansible_host', inventory_hostname)
|
||||
# If the user did not set ansible_host, ansible fills it in with the address
|
||||
# of the delegate host when delegating, so only use ansible_host when not delegating.
|
||||
dest_host = ((task_vars.get('ansible_host') if delegate_to is None else None)
|
||||
or dest_host_inventory_vars.get('ansible_host')
|
||||
or inventory_hostname)
|
||||
if self._templar is not None:
|
||||
dest_host = self._templar.template(dest_host)
|
||||
|
||||
dest_host_ids = [hostid for hostid in (dest_host_inventory_vars.get('inventory_hostname'),
|
||||
dest_host_inventory_vars.get('ansible_host'))
|
||||
dest_host_inventory_vars.get('ansible_host'),
|
||||
dest_host)
|
||||
if hostid is not None]
|
||||
|
||||
localhost_ports = set()
|
||||
@@ -371,7 +378,10 @@ class ActionModule(ActionBase):
|
||||
src = self._process_origin(src_host, src, user)
|
||||
dest = self._process_remote(_tmp_args, dest_host, dest, user, inv_port in localhost_ports)
|
||||
|
||||
password = dest_host_inventory_vars.get('ansible_ssh_pass', None) or dest_host_inventory_vars.get('ansible_password', None)
|
||||
password = (task_vars.get('ansible_ssh_pass')
|
||||
or task_vars.get('ansible_password')
|
||||
or dest_host_inventory_vars.get('ansible_ssh_pass', None)
|
||||
or dest_host_inventory_vars.get('ansible_password', None))
|
||||
if self._templar is not None:
|
||||
password = self._templar.template(password)
|
||||
else:
|
||||
|
||||
@@ -224,9 +224,11 @@ except ImportError:
|
||||
try:
|
||||
import firewall.client as fw_client
|
||||
import firewall.config as fw_config
|
||||
import firewall.errors as fw_errors
|
||||
HAS_FIREWALLD = True
|
||||
except ImportError:
|
||||
HAS_FIREWALLD = False
|
||||
fw_errors = None
|
||||
|
||||
|
||||
def get_version():
|
||||
@@ -387,6 +389,8 @@ def main():
|
||||
module.fail_json(msg=('Unable to gather firewalld settings.'
|
||||
' You may need to run as the root user or'
|
||||
' use become. (Error: %s)' % to_native(e)))
|
||||
except fw_errors.FirewallError as e:
|
||||
module.fail_json(msg='Unable to gather firewalld settings. (Error: %s)' % to_native(e))
|
||||
|
||||
result['collected_zones'] = collect_zones
|
||||
result['undefined_zones'] = ignore_zones
|
||||
|
||||
+91
-63
@@ -88,6 +88,13 @@ options:
|
||||
fail if multiple devices are mounted on the same mount point. Using
|
||||
V(absent) with a mount point that is not registered in the I(fstab) has
|
||||
no effect, use V(unmounted) instead.
|
||||
- V(absent_keep_mountpoint) specifies that the mount point entry O(path) will be removed
|
||||
from I(fstab) and will also unmount the mounted device. The associated
|
||||
mountpoint will not be removed. A mounted device will be unmounted regardless
|
||||
of O(src) or its real source. V(absent_keep_mountpoint) does not unmount recursively,
|
||||
and the module will fail if multiple devices are mounted on the same mount
|
||||
point. Using V(absent_keep_mountpoint) with a mount point that is not registered in the
|
||||
I(fstab) has no effect, use V(unmounted) instead.
|
||||
- V(remounted) specifies that the device will be remounted for when you
|
||||
want to force a refresh on the mount itself (added in 2.9). This will
|
||||
always return RV(ignore:changed=true). If O(opts) is set, the options will be
|
||||
@@ -102,7 +109,7 @@ options:
|
||||
mountpoint.
|
||||
type: str
|
||||
required: true
|
||||
choices: [ absent, absent_from_fstab, mounted, present, unmounted, remounted, ephemeral ]
|
||||
choices: [ absent, absent_from_fstab, absent_keep_mountpoint, mounted, present, unmounted, remounted, ephemeral ]
|
||||
fstab:
|
||||
description:
|
||||
- File to use instead of C(/etc/fstab).
|
||||
@@ -170,6 +177,11 @@ EXAMPLES = r'''
|
||||
path: /tmp/mnt-pnt
|
||||
state: unmounted
|
||||
|
||||
- name: Unmount a mounted volume and remove its fstab entry
|
||||
ansible.posix.mount:
|
||||
path: /tmp/mnt-pnt
|
||||
state: absent_keep_mountpoint
|
||||
|
||||
- name: Remount a mounted volume
|
||||
ansible.posix.mount:
|
||||
path: /tmp/mnt-pnt
|
||||
@@ -229,12 +241,14 @@ from ansible.module_utils.common.text.converters import to_bytes, to_native
|
||||
from ansible.module_utils.parsing.convert_bool import boolean
|
||||
|
||||
|
||||
PLATFORM = platform.system().lower()
|
||||
|
||||
|
||||
def write_fstab(module, lines, path):
|
||||
|
||||
backup_file = ""
|
||||
if module.params['backup']:
|
||||
backup_file = module.backup_local(path)
|
||||
else:
|
||||
backup_file = ""
|
||||
|
||||
fs_w = open(path, 'w')
|
||||
|
||||
@@ -257,12 +271,7 @@ def _escape_fstab(v):
|
||||
|
||||
if isinstance(v, int):
|
||||
return v
|
||||
else:
|
||||
return (
|
||||
v.
|
||||
replace('\\', '\\134').
|
||||
replace(' ', '\\040').
|
||||
replace('&', '\\046'))
|
||||
return v.replace('\\', '\\134').replace(' ', '\\040').replace('&', '\\046')
|
||||
|
||||
|
||||
def set_mount(module, args):
|
||||
@@ -281,7 +290,7 @@ def _set_mount_save_old(module, args):
|
||||
escaped_args = dict([(k, _escape_fstab(v)) for k, v in args.items()])
|
||||
new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
new_line = (
|
||||
'%(src)s - %(name)s %(fstype)s %(passno)s %(boot)s %(opts)s\n')
|
||||
|
||||
@@ -307,16 +316,16 @@ def _set_mount_save_old(module, args):
|
||||
# Check if we got a valid line for splitting
|
||||
# (on Linux the 5th and the 6th field is optional)
|
||||
if (
|
||||
platform.system() == 'SunOS' and len(fields) != 7 or
|
||||
platform.system() == 'Linux' and len(fields) not in [4, 5, 6] or
|
||||
platform.system() not in ['SunOS', 'Linux'] and len(fields) != 6):
|
||||
PLATFORM == 'sunos' and len(fields) != 7 or
|
||||
PLATFORM == 'linux' and len(fields) not in [4, 5, 6] or
|
||||
PLATFORM not in ['sunos', 'linux'] and len(fields) != 6):
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
ld = {}
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
(
|
||||
ld['src'],
|
||||
dash,
|
||||
@@ -354,7 +363,7 @@ def _set_mount_save_old(module, args):
|
||||
exists = True
|
||||
args_to_check = ('src', 'fstype', 'opts', 'dump', 'passno')
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
args_to_check = ('src', 'fstype', 'passno', 'boot', 'opts')
|
||||
|
||||
for t in args_to_check:
|
||||
@@ -377,35 +386,35 @@ def _set_mount_save_old(module, args):
|
||||
return (args['name'], old_lines, changed)
|
||||
|
||||
|
||||
def unset_mount(module, args):
|
||||
def unset_mount(module, args, backup=False):
|
||||
"""Remove a mount point from fstab."""
|
||||
|
||||
to_write = []
|
||||
changed = False
|
||||
escaped_name = _escape_fstab(args['name'])
|
||||
|
||||
for line in open(args['fstab'], 'r').readlines():
|
||||
lines = open(args['fstab'], 'r').readlines()
|
||||
for line in lines:
|
||||
if not line.strip():
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
if line.strip().startswith('#'):
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
line_fields = line.split()
|
||||
# Check if we got a valid line for splitting
|
||||
if (
|
||||
platform.system() == 'SunOS' and len(line.split()) != 7 or
|
||||
platform.system() != 'SunOS' and len(line.split()) != 6):
|
||||
PLATFORM == 'sunos' and len(line_fields) != 7 or
|
||||
PLATFORM != 'sunos' and len(line_fields) != 6):
|
||||
to_write.append(line)
|
||||
|
||||
continue
|
||||
|
||||
ld = {}
|
||||
|
||||
if platform.system() == 'SunOS':
|
||||
if PLATFORM == 'sunos':
|
||||
(
|
||||
ld['src'],
|
||||
dash,
|
||||
@@ -414,7 +423,7 @@ def unset_mount(module, args):
|
||||
ld['passno'],
|
||||
ld['boot'],
|
||||
ld['opts']
|
||||
) = line.split()
|
||||
) = line_fields
|
||||
else:
|
||||
(
|
||||
ld['src'],
|
||||
@@ -423,7 +432,7 @@ def unset_mount(module, args):
|
||||
ld['opts'],
|
||||
ld['dump'],
|
||||
ld['passno']
|
||||
) = line.split()
|
||||
) = line_fields
|
||||
|
||||
if (
|
||||
ld['name'] != escaped_name or (
|
||||
@@ -442,7 +451,9 @@ def unset_mount(module, args):
|
||||
if changed and not module.check_mode:
|
||||
write_fstab(module, to_write, args['fstab'])
|
||||
|
||||
return (args['name'], changed)
|
||||
if backup:
|
||||
return (args['name'], changed, lines)
|
||||
return (args['name'], changed, [])
|
||||
|
||||
|
||||
def _set_fstab_args(fstab_file):
|
||||
@@ -451,8 +462,8 @@ def _set_fstab_args(fstab_file):
|
||||
if (
|
||||
fstab_file and
|
||||
fstab_file != '/etc/fstab' and
|
||||
platform.system().lower() != 'sunos'):
|
||||
if platform.system().lower().endswith('bsd'):
|
||||
PLATFORM != 'sunos'):
|
||||
if PLATFORM.endswith('bsd'):
|
||||
result.append('-F')
|
||||
else:
|
||||
result.append('-T')
|
||||
@@ -465,7 +476,7 @@ def _set_fstab_args(fstab_file):
|
||||
def _set_ephemeral_args(args):
|
||||
result = []
|
||||
# Set fstype switch according to platform. SunOS/Solaris use -F
|
||||
if platform.system().lower() == 'sunos':
|
||||
if PLATFORM == 'sunos':
|
||||
result.append('-F')
|
||||
else:
|
||||
result.append('-t')
|
||||
@@ -487,7 +498,7 @@ def mount(module, args):
|
||||
name = args['name']
|
||||
cmd = [mount_bin]
|
||||
|
||||
if platform.system().lower() == 'openbsd':
|
||||
if PLATFORM == 'openbsd':
|
||||
# Use module.params['fstab'] here as args['fstab'] has been set to the
|
||||
# default value.
|
||||
if module.params['fstab'] is not None:
|
||||
@@ -508,8 +519,7 @@ def mount(module, args):
|
||||
|
||||
if rc == 0:
|
||||
return 0, ''
|
||||
else:
|
||||
return rc, out + err
|
||||
return rc, out + err
|
||||
|
||||
|
||||
def umount(module, path):
|
||||
@@ -522,8 +532,7 @@ def umount(module, path):
|
||||
|
||||
if rc == 0:
|
||||
return 0, ''
|
||||
else:
|
||||
return rc, out + err
|
||||
return rc, out + err
|
||||
|
||||
|
||||
def remount(module, args):
|
||||
@@ -532,7 +541,7 @@ def remount(module, args):
|
||||
cmd = [mount_bin]
|
||||
|
||||
# Multiplatform remount opts
|
||||
if platform.system().lower().endswith('bsd'):
|
||||
if PLATFORM.endswith('bsd'):
|
||||
if module.params['state'] == 'remounted' and args['opts'] != 'defaults':
|
||||
cmd += ['-u', '-o', args['opts']]
|
||||
else:
|
||||
@@ -543,7 +552,7 @@ def remount(module, args):
|
||||
else:
|
||||
cmd += ['-o', 'remount']
|
||||
|
||||
if platform.system().lower() == 'openbsd':
|
||||
if PLATFORM == 'openbsd':
|
||||
# Use module.params['fstab'] here as args['fstab'] has been set to the
|
||||
# default value.
|
||||
if module.params['fstab'] is not None:
|
||||
@@ -562,7 +571,7 @@ def remount(module, args):
|
||||
out = err = ''
|
||||
|
||||
try:
|
||||
if module.params['state'] != 'ephemeral' and platform.system().lower().endswith('bsd'):
|
||||
if module.params['state'] != 'ephemeral' and PLATFORM.endswith('bsd'):
|
||||
# Note: Forcing BSDs to do umount/mount due to BSD remount not
|
||||
# working as expected (suspect bug in the BSD mount command)
|
||||
# Interested contributor could rework this to use mount options on
|
||||
@@ -618,7 +627,7 @@ def is_bind_mounted(module, linux_mounts, dest, src=None, fstype=None):
|
||||
|
||||
is_mounted = False
|
||||
|
||||
if platform.system() == 'Linux' and linux_mounts is not None:
|
||||
if PLATFORM == 'linux' and linux_mounts is not None:
|
||||
if src is None:
|
||||
# That's for unmounted/absent
|
||||
if dest in linux_mounts:
|
||||
@@ -732,7 +741,7 @@ def _is_same_mount_src(module, src, mountpoint, linux_mounts):
|
||||
return False
|
||||
|
||||
# Treat Linux bind mounts
|
||||
if platform.system() == 'Linux' and linux_mounts is not None:
|
||||
if PLATFORM == 'linux' and linux_mounts is not None:
|
||||
# For Linux bind mounts only: the mount command does not return
|
||||
# the actual source for bind mounts, but the device of the source.
|
||||
# is_bind_mounted() called with the 'src' parameter will return True if
|
||||
@@ -777,7 +786,20 @@ def main():
|
||||
passno=dict(type='str', no_log=False, default='0'),
|
||||
src=dict(type='path'),
|
||||
backup=dict(type='bool', default=False),
|
||||
state=dict(type='str', required=True, choices=['absent', 'absent_from_fstab', 'mounted', 'present', 'unmounted', 'remounted', 'ephemeral']),
|
||||
state={
|
||||
'type': 'str',
|
||||
'required': True,
|
||||
'choices': [
|
||||
'absent',
|
||||
'absent_from_fstab',
|
||||
'absent_keep_mountpoint',
|
||||
'mounted',
|
||||
'present',
|
||||
'unmounted',
|
||||
'remounted',
|
||||
'ephemeral'
|
||||
]
|
||||
},
|
||||
),
|
||||
supports_check_mode=True,
|
||||
required_if=(
|
||||
@@ -796,30 +818,35 @@ def main():
|
||||
# name, src, fstype, opts, dump, passno, state, fstab=/etc/fstab
|
||||
# Note: Do not modify module.params['fstab'] as we need to know if the user
|
||||
# explicitly specified it in mount() and remount()
|
||||
if platform.system().lower() == 'sunos':
|
||||
args = dict(
|
||||
name=module.params['path'],
|
||||
opts='-',
|
||||
passno='-',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes' if module.params['boot'] else 'no',
|
||||
args = dict(
|
||||
name=module.params['path'],
|
||||
)
|
||||
if PLATFORM == 'sunos':
|
||||
args.update(
|
||||
dict(
|
||||
opts='-',
|
||||
passno='-',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes' if module.params['boot'] else 'no',
|
||||
)
|
||||
)
|
||||
if args['fstab'] is None:
|
||||
args['fstab'] = '/etc/vfstab'
|
||||
else:
|
||||
args = dict(
|
||||
name=module.params['path'],
|
||||
opts='defaults',
|
||||
dump='0',
|
||||
passno='0',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes',
|
||||
args.update(
|
||||
dict(
|
||||
opts='defaults',
|
||||
dump='0',
|
||||
passno='0',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes',
|
||||
)
|
||||
)
|
||||
if args['fstab'] is None:
|
||||
args['fstab'] = '/etc/fstab'
|
||||
|
||||
# FreeBSD doesn't have any 'default' so set 'rw' instead
|
||||
if platform.system() == 'FreeBSD':
|
||||
if PLATFORM == 'freebsd':
|
||||
args['opts'] = 'rw'
|
||||
|
||||
args['backup_file'] = ""
|
||||
@@ -827,7 +854,7 @@ def main():
|
||||
|
||||
# Cache all mounts here in order we have consistent results if we need to
|
||||
# call is_bind_mounted() multiple times
|
||||
if platform.system() == 'Linux':
|
||||
if PLATFORM == 'linux':
|
||||
linux_mounts = get_linux_mounts(module)
|
||||
|
||||
if linux_mounts is None:
|
||||
@@ -837,7 +864,7 @@ def main():
|
||||
for key in ('src', 'fstype', 'passno', 'opts', 'dump', 'fstab'):
|
||||
if module.params[key] is not None:
|
||||
args[key] = module.params[key]
|
||||
if platform.system().lower() == 'linux' or platform.system().lower().endswith('bsd'):
|
||||
if PLATFORM == 'linux' or PLATFORM.endswith('bsd'):
|
||||
# Linux, FreeBSD, NetBSD and OpenBSD have 'noauto' as mount option to
|
||||
# handle mount on boot. To avoid mount option conflicts, if 'noauto'
|
||||
# specified in 'opts', mount module will ignore 'boot'.
|
||||
@@ -880,19 +907,20 @@ def main():
|
||||
changed = False
|
||||
|
||||
if state == 'absent_from_fstab':
|
||||
name, changed = unset_mount(module, args)
|
||||
elif state == 'absent':
|
||||
name, changed = unset_mount(module, args)
|
||||
name, changed, _dummy = unset_mount(module, args, backup=False)
|
||||
elif state == 'absent' or state == 'absent_keep_mountpoint':
|
||||
name, changed, backup_lines = unset_mount(module, args, backup=True)
|
||||
|
||||
if changed and not module.check_mode:
|
||||
if ismount(name) or is_bind_mounted(module, linux_mounts, name):
|
||||
res, msg = umount(module, name)
|
||||
|
||||
if res:
|
||||
module.fail_json(
|
||||
msg="Error unmounting %s: %s" % (name, msg))
|
||||
# failed to unmount, restore fstab
|
||||
write_fstab(module, backup_lines, args['fstab'])
|
||||
module.fail_json(msg="Error unmounting %s: %s" % (name, msg))
|
||||
|
||||
if os.path.exists(name):
|
||||
if os.path.exists(name) and state == 'absent':
|
||||
try:
|
||||
os.rmdir(name)
|
||||
except (OSError, IOError) as e:
|
||||
@@ -1007,7 +1035,7 @@ def main():
|
||||
|
||||
# If the managed node is Solaris, convert the boot value type to Boolean
|
||||
# to match the type of return value with the module argument.
|
||||
if platform.system().lower() == 'sunos':
|
||||
if PLATFORM == 'sunos':
|
||||
args['boot'] = boolean(args['boot'])
|
||||
module.exit_json(changed=changed, **args)
|
||||
|
||||
|
||||
@@ -632,8 +632,10 @@ def main():
|
||||
return module.fail_json(msg=err, rc=rc, cmd=cmdstr)
|
||||
|
||||
if link_dest:
|
||||
# a leading period indicates no change
|
||||
changed = (changed_marker + '.') not in out
|
||||
# -vv also itemizes unchanged items: a period, the file type, then
|
||||
# spaces (e.g. '.f foo'). Every other itemized line is a change.
|
||||
items = [line[len(changed_marker):] for line in out.splitlines() if line.startswith(changed_marker)]
|
||||
changed = any(not (item.startswith('.') and item[2:3] == ' ') for item in items)
|
||||
else:
|
||||
changed = changed_marker in out
|
||||
|
||||
|
||||
@@ -297,10 +297,17 @@
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: dest_stat
|
||||
|
||||
- name: Check if the mountpoint still exists
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: mountpoint_stat
|
||||
|
||||
- name: Check that we did not unmount
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- unmount_result['changed']
|
||||
- mountpoint_stat['stat']['exists']
|
||||
- dest_stat['stat']['exists']
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
|
||||
@@ -318,10 +325,65 @@
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: dest_stat
|
||||
|
||||
- name: Check that the mountpoint no longer exists
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: mountpoint_stat
|
||||
|
||||
- name: Check that we unmounted
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- unmount_result['changed']
|
||||
- not mountpoint_stat['stat']['exists']
|
||||
- not dest_stat['stat']['exists']
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
|
||||
# unmount (absent_keep_mountpoint)
|
||||
- name: Bind mount a filesystem (Linux)
|
||||
ansible.posix.mount:
|
||||
src: '{{ output_dir }}/mount_source'
|
||||
name: '{{ output_dir }}/mount_dest'
|
||||
state: mounted
|
||||
fstype: None
|
||||
opts: bind
|
||||
when: ansible_system == 'Linux'
|
||||
register: bind_result_linux
|
||||
|
||||
- name: Bind mount a filesystem (FreeBSD)
|
||||
ansible.posix.mount:
|
||||
src: '{{ output_dir }}/mount_source'
|
||||
name: '{{ output_dir }}/mount_dest'
|
||||
state: mounted
|
||||
fstype: nullfs
|
||||
when: ansible_system == 'FreeBSD'
|
||||
register: bind_result_freebsd
|
||||
|
||||
- name: Unmount the bind mount while keeping the mountpoint
|
||||
ansible.posix.mount:
|
||||
name: '{{ output_dir }}/mount_dest'
|
||||
state: absent_keep_mountpoint
|
||||
when: ansible_system in ('Linux', 'FreeBSD')
|
||||
register: unmount_result
|
||||
|
||||
- name: Make sure the file no longer exists in dest
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest/test_file'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: dest_stat
|
||||
|
||||
- name: Check if the mountpoint still exists
|
||||
ansible.builtin.stat:
|
||||
path: '{{ output_dir }}/mount_dest'
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
register: mountpoint_stat
|
||||
|
||||
- name: Check that we unmounted and that the mountpoint still exists
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- (ansible_system == 'Linux' and bind_result_linux['changed']) or (ansible_system == 'FreeBSD' and bind_result_freebsd['changed'])
|
||||
- unmount_result['changed']
|
||||
- mountpoint_stat['stat']['exists']
|
||||
- not dest_stat['stat']['exists']
|
||||
when: ansible_system in ('FreeBSD', 'Linux')
|
||||
|
||||
@@ -1103,10 +1165,16 @@
|
||||
opts: rw
|
||||
opts_no_log: true
|
||||
register: mount_info
|
||||
- name: Assert opts_no_log option true
|
||||
- name: Assert opts_no_log option true (ansible-core < 2.22)
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- mount_info.opts == 'VALUE_SPECIFIED_IN_NO_LOG_PARAMETER'
|
||||
when: ansible_version.full is ansible.builtin.version('2.22', '<')
|
||||
- name: Assert opts_no_log option true (ansible-core >= 2.22)
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- mount_info.opts == 'rw'
|
||||
when: ansible_version.full is ansible.builtin.version('2.22', '>=')
|
||||
- name: Remount the FS with opts_no_log option false
|
||||
ansible.posix.mount:
|
||||
path: /tmp/myfs
|
||||
|
||||
@@ -299,6 +299,102 @@
|
||||
- directory_a
|
||||
- directory_b
|
||||
|
||||
- name: Setup - directories for link_dest change detection
|
||||
ansible.builtin.file:
|
||||
state: directory
|
||||
path: "{{ output_dir }}/{{ item }}"
|
||||
mode: "0750"
|
||||
loop:
|
||||
- link_dest_src
|
||||
- link_dest_dst
|
||||
- link_dest_base
|
||||
|
||||
- name: Setup - create source files for link_dest change detection
|
||||
ansible.builtin.copy:
|
||||
dest: "{{ output_dir }}/link_dest_src/{{ item }}"
|
||||
mode: "0640"
|
||||
content: hello world
|
||||
loop:
|
||||
- foo.txt
|
||||
- bar.txt
|
||||
# the module's output marker in a file name must not count as a change
|
||||
- "<<CHANGED>>baz.txt"
|
||||
|
||||
- name: Synchronize a directory using link_dest
|
||||
ansible.posix.synchronize:
|
||||
src: "{{ output_dir }}/link_dest_src/"
|
||||
dest: "{{ output_dir }}/link_dest_dst/"
|
||||
link_dest:
|
||||
- "{{ output_dir }}/link_dest_base"
|
||||
register: sync_initial
|
||||
delegate_to: "{{ inventory_hostname }}"
|
||||
|
||||
- name: Synchronize the same directory again using link_dest
|
||||
ansible.posix.synchronize:
|
||||
src: "{{ output_dir }}/link_dest_src/"
|
||||
dest: "{{ output_dir }}/link_dest_dst/"
|
||||
link_dest:
|
||||
- "{{ output_dir }}/link_dest_base"
|
||||
register: sync_unchanged
|
||||
delegate_to: "{{ inventory_hostname }}"
|
||||
|
||||
- name: Change the content of one source file only
|
||||
ansible.builtin.copy:
|
||||
dest: "{{ output_dir }}/link_dest_src/bar.txt"
|
||||
mode: "0640"
|
||||
content: goodbye world
|
||||
|
||||
# rsync -vv still lists the unchanged foo.txt, which used to hide the change
|
||||
- name: Synchronize using link_dest after a content change
|
||||
ansible.posix.synchronize:
|
||||
src: "{{ output_dir }}/link_dest_src/"
|
||||
dest: "{{ output_dir }}/link_dest_dst/"
|
||||
link_dest:
|
||||
- "{{ output_dir }}/link_dest_base"
|
||||
register: sync_content
|
||||
delegate_to: "{{ inventory_hostname }}"
|
||||
|
||||
- name: Change the permissions of one source file only
|
||||
ansible.builtin.file:
|
||||
path: "{{ output_dir }}/link_dest_src/foo.txt"
|
||||
mode: "0600"
|
||||
|
||||
- name: Synchronize using link_dest after a permission change
|
||||
ansible.posix.synchronize:
|
||||
src: "{{ output_dir }}/link_dest_src/"
|
||||
dest: "{{ output_dir }}/link_dest_dst/"
|
||||
link_dest:
|
||||
- "{{ output_dir }}/link_dest_base"
|
||||
register: sync_mode
|
||||
delegate_to: "{{ inventory_hostname }}"
|
||||
|
||||
- name: Synchronize again using link_dest after the changes
|
||||
ansible.posix.synchronize:
|
||||
src: "{{ output_dir }}/link_dest_src/"
|
||||
dest: "{{ output_dir }}/link_dest_dst/"
|
||||
link_dest:
|
||||
- "{{ output_dir }}/link_dest_base"
|
||||
register: sync_unchanged_again
|
||||
delegate_to: "{{ inventory_hostname }}"
|
||||
|
||||
- name: Ensure link_dest reports a change only when something changed
|
||||
ansible.builtin.assert:
|
||||
that:
|
||||
- sync_initial is changed
|
||||
- sync_unchanged is not changed
|
||||
- sync_content is changed
|
||||
- sync_mode is changed
|
||||
- sync_unchanged_again is not changed
|
||||
|
||||
- name: Cleanup
|
||||
ansible.builtin.file:
|
||||
state: absent
|
||||
path: "{{ output_dir }}/{{ item }}"
|
||||
loop:
|
||||
- link_dest_src
|
||||
- link_dest_dst
|
||||
- link_dest_base
|
||||
|
||||
- name: Setup - test for source with working dir with spaces in path
|
||||
ansible.builtin.file:
|
||||
state: directory
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
---
|
||||
# Test that ansible_host set via play-level vars: (present in task_vars but
|
||||
# absent from the hostvars snapshot for the target host) is correctly used
|
||||
# to build the rsync destination instead of falling back to inventory_hostname.
|
||||
# Regression test for https://github.com/ansible-collections/ansible.posix/issues/469
|
||||
fixtures:
|
||||
taskvars_in: taskvars_in.json
|
||||
taskvars_out: taskvars_out.json
|
||||
connection:
|
||||
transport: ssh
|
||||
hostvars:
|
||||
127.0.0.1: {}
|
||||
::1: {}
|
||||
localhost: {}
|
||||
asserts:
|
||||
- hasattr(SAM._connection, 'ismock')
|
||||
- self.execute_called
|
||||
- self.final_module_args['_local_rsync_path'] == 'rsync'
|
||||
- self.final_module_args['src'] == '/tmp/deleteme'
|
||||
- self.final_module_args['dest'] == 'root@el6host.example.org:/tmp/deleteme'
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"inventory_hostname": "el6host",
|
||||
"ansible_user": "root",
|
||||
"ansible_host": "el6host.example.org",
|
||||
"hostvars": {
|
||||
"el6host": {}
|
||||
},
|
||||
"vars": {
|
||||
"ansible_host": "el6host.example.org"
|
||||
}
|
||||
}
|
||||
+1
@@ -0,0 +1 @@
|
||||
{}
|
||||
@@ -55,6 +55,9 @@ class TaskMock(object):
|
||||
become_user = None
|
||||
become_method = None
|
||||
check_mode = False
|
||||
delegate_to = None
|
||||
diff = False
|
||||
no_log = None
|
||||
|
||||
|
||||
class StdinMock(object):
|
||||
@@ -64,6 +67,10 @@ class StdinMock(object):
|
||||
class ConnectionMock(object):
|
||||
ismock = True
|
||||
_play_context = None
|
||||
always_pipeline_modules = False
|
||||
become = None
|
||||
has_pipelining = False
|
||||
socket_path = None
|
||||
# transport = 'ssh'
|
||||
transport = None
|
||||
_new_stdin = StdinMock()
|
||||
@@ -121,6 +128,9 @@ class SynchronizeTester(object):
|
||||
return {}
|
||||
|
||||
def runtest(self, fixturepath='fixtures/synchronize/basic'):
|
||||
# Reset task and connection to avoid state leaking between tests
|
||||
self.task = TaskMock()
|
||||
self.connection = ConnectionMock()
|
||||
|
||||
metapath = os.path.join(fixturepath, 'meta.yaml')
|
||||
with open(metapath, 'rb') as f:
|
||||
@@ -214,6 +224,15 @@ class TestSynchronizeAction(unittest.TestCase):
|
||||
x = SynchronizeTester()
|
||||
x.runtest(fixturepath=os.path.join(self.fixturedir, 'basic'))
|
||||
|
||||
@patch('ansible_collections.ansible.posix.plugins.action.synchronize.connection_loader', FakePluginLoader)
|
||||
def test_ansible_host_from_task_vars(self):
|
||||
# ansible_host set only via play-level vars (present in top-level
|
||||
# task_vars, absent from the hostvars snapshot for the target host)
|
||||
# must still be used to build the rsync destination.
|
||||
# Regression test for https://github.com/ansible-collections/ansible.posix/issues/469
|
||||
x = SynchronizeTester()
|
||||
x.runtest(fixturepath=os.path.join(self.fixturedir, 'ansible_host_from_task_vars'))
|
||||
|
||||
@patch('ansible_collections.ansible.posix.plugins.action.synchronize.connection_loader', FakePluginLoader)
|
||||
def test_basic_become(self):
|
||||
x = SynchronizeTester()
|
||||
|
||||
Reference in New Issue
Block a user