mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-11-22 15:10:30 +00:00
Compare commits
7
Commits
20699d7184
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4daa61d294 | ||
|
|
4bd26a3cc6 | ||
|
|
0f4453f85e | ||
|
|
dddd6c9b35 | ||
|
|
d5699a3fcf | ||
|
|
2f2a8e9b96 | ||
|
|
93f25f88b8 |
@@ -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:
|
||||
|
||||
@@ -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,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.
|
||||
...
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1165,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