Auto-fix usage of modules via FQCN
Since ansible-core 2.10 it is recommended to use modules via FQCN In order to align with recommendation, we perform migration by applying suggestions made by `ansible-lint --fix=fqcn` Change-Id: I2e3312f1bccc30dbf7504ab503afa97a945cb061
This commit is contained in:
parent
c2048a7148
commit
0152215eb4
@ -27,7 +27,7 @@
|
|||||||
- systemd_networkd_distro_packages | length > 0
|
- systemd_networkd_distro_packages | length > 0
|
||||||
|
|
||||||
- name: Restart networkd
|
- name: Restart networkd
|
||||||
systemd:
|
ansible.builtin.systemd:
|
||||||
name: "systemd-networkd"
|
name: "systemd-networkd"
|
||||||
state: restarted
|
state: restarted
|
||||||
enabled: "yes"
|
enabled: "yes"
|
||||||
@ -40,12 +40,12 @@
|
|||||||
- systemd-networkd
|
- systemd-networkd
|
||||||
|
|
||||||
- name: (RE)Gather facts post setup
|
- name: (RE)Gather facts post setup
|
||||||
setup:
|
ansible.builtin.setup:
|
||||||
gather_subset: "network,hardware,virtual"
|
gather_subset: "network,hardware,virtual"
|
||||||
listen: Restart systemd-networkd
|
listen: Restart systemd-networkd
|
||||||
|
|
||||||
- name: Restart systemd-resolved
|
- name: Restart systemd-resolved
|
||||||
systemd:
|
ansible.builtin.systemd:
|
||||||
name: "systemd-resolved"
|
name: "systemd-resolved"
|
||||||
state: restarted
|
state: restarted
|
||||||
enabled: "yes"
|
enabled: "yes"
|
||||||
@ -54,7 +54,7 @@
|
|||||||
- systemd-resolved
|
- systemd-resolved
|
||||||
|
|
||||||
- name: Update initramfs
|
- name: Update initramfs
|
||||||
command: "{{ systemd_networkd_update_initramfs }}" # noqa: no-changed-when
|
ansible.builtin.command: "{{ systemd_networkd_update_initramfs }}" # noqa: no-changed-when
|
||||||
when:
|
when:
|
||||||
- ansible_facts['virtualization_type'] != "systemd-nspawn"
|
- ansible_facts['virtualization_type'] != "systemd-nspawn"
|
||||||
- ansible_facts['virtualization_type'] != "lxc"
|
- ansible_facts['virtualization_type'] != "lxc"
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
- name: Gather variables for each operating system
|
- name: Gather variables for each operating system
|
||||||
include_vars: "{{ lookup('first_found', params) }}"
|
ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
|
||||||
vars:
|
vars:
|
||||||
params:
|
params:
|
||||||
files:
|
files:
|
||||||
@ -36,7 +36,7 @@
|
|||||||
# Copy all factored-in GPG keys.
|
# Copy all factored-in GPG keys.
|
||||||
# KeyID 2F86D6A1 from https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
|
# KeyID 2F86D6A1 from https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
|
||||||
- name: If a keyfile is provided, copy the gpg keyfile to the key location
|
- name: If a keyfile is provided, copy the gpg keyfile to the key location
|
||||||
copy:
|
ansible.builtin.copy:
|
||||||
src: "{{ item.keyfile }}"
|
src: "{{ item.keyfile }}"
|
||||||
dest: "{{ item.key }}"
|
dest: "{{ item.key }}"
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
@ -45,7 +45,7 @@
|
|||||||
- ansible_facts['os_family'] | lower == 'redhat'
|
- ansible_facts['os_family'] | lower == 'redhat'
|
||||||
|
|
||||||
- name: Ensure GPG keys have the correct SELinux contexts applied
|
- name: Ensure GPG keys have the correct SELinux contexts applied
|
||||||
command: restorecon -Rv /etc/pki/rpm-gpg/
|
ansible.builtin.command: restorecon -Rv /etc/pki/rpm-gpg/
|
||||||
# TODO(evrardjp): Be more idempotent
|
# TODO(evrardjp): Be more idempotent
|
||||||
changed_when: false
|
changed_when: false
|
||||||
when:
|
when:
|
||||||
@ -53,7 +53,7 @@
|
|||||||
|
|
||||||
# Handle gpg keys manually
|
# Handle gpg keys manually
|
||||||
- name: Install gpg keys
|
- name: Install gpg keys
|
||||||
rpm_key:
|
ansible.builtin.rpm_key:
|
||||||
key: "{{ key.key }}"
|
key: "{{ key.key }}"
|
||||||
validate_certs: "{{ key.validate_certs | default(omit) }}"
|
validate_certs: "{{ key.validate_certs | default(omit) }}"
|
||||||
state: "{{ key.state | default('present') }}"
|
state: "{{ key.state | default('present') }}"
|
||||||
@ -69,7 +69,7 @@
|
|||||||
|
|
||||||
# NOTE(jrosser) this repo is configured with the path to the first gpg key provided
|
# NOTE(jrosser) this repo is configured with the path to the first gpg key provided
|
||||||
- name: Install the EPEL repository
|
- name: Install the EPEL repository
|
||||||
yum_repository:
|
ansible.builtin.yum_repository:
|
||||||
name: epel-networkd
|
name: epel-networkd
|
||||||
baseurl: "{{ systemd_networkd_epel_mirror ~ '/' ~ ansible_facts['distribution_major_version'] ~ '/Everything/' ~ ansible_facts['architecture'] }}"
|
baseurl: "{{ systemd_networkd_epel_mirror ~ '/' ~ ansible_facts['distribution_major_version'] ~ '/Everything/' ~ ansible_facts['architecture'] }}"
|
||||||
description: "Extra Packages for Enterprise Linux $releasever - $basearch"
|
description: "Extra Packages for Enterprise Linux $releasever - $basearch"
|
||||||
@ -86,7 +86,7 @@
|
|||||||
delay: 2
|
delay: 2
|
||||||
|
|
||||||
- name: Install networkd distro packages
|
- name: Install networkd distro packages
|
||||||
package:
|
ansible.builtin.package:
|
||||||
name: "{{ systemd_networkd_distro_packages | select() }}"
|
name: "{{ systemd_networkd_distro_packages | select() }}"
|
||||||
state: "present"
|
state: "present"
|
||||||
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
|
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
|
||||||
@ -100,7 +100,7 @@
|
|||||||
- Restart systemd-networkd
|
- Restart systemd-networkd
|
||||||
|
|
||||||
- name: Create systemd-networkd directory
|
- name: Create systemd-networkd directory
|
||||||
file:
|
ansible.builtin.file:
|
||||||
path: "/etc/systemd/network"
|
path: "/etc/systemd/network"
|
||||||
state: directory
|
state: directory
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
@ -108,7 +108,7 @@
|
|||||||
- systemd-networkd
|
- systemd-networkd
|
||||||
|
|
||||||
- name: Create systemd-resolved config
|
- name: Create systemd-resolved config
|
||||||
template:
|
ansible.builtin.template:
|
||||||
src: "systemd-resolved.conf.j2"
|
src: "systemd-resolved.conf.j2"
|
||||||
dest: "/etc/systemd/resolved.conf"
|
dest: "/etc/systemd/resolved.conf"
|
||||||
owner: "root"
|
owner: "root"
|
||||||
@ -123,7 +123,7 @@
|
|||||||
- systemd-resolved
|
- systemd-resolved
|
||||||
|
|
||||||
- name: Find prefixed netdev and network files
|
- name: Find prefixed netdev and network files
|
||||||
find:
|
ansible.builtin.find:
|
||||||
paths: "/etc/systemd/network"
|
paths: "/etc/systemd/network"
|
||||||
patterns: "*{{ systemd_networkd_prefix }}*.netdev,*{{ systemd_networkd_prefix }}*.network"
|
patterns: "*{{ systemd_networkd_prefix }}*.netdev,*{{ systemd_networkd_prefix }}*.network"
|
||||||
register: networkd_files
|
register: networkd_files
|
||||||
@ -133,7 +133,7 @@
|
|||||||
- systemd-networkd
|
- systemd-networkd
|
||||||
|
|
||||||
- name: Remove prefixed network files
|
- name: Remove prefixed network files
|
||||||
file:
|
ansible.builtin.file:
|
||||||
path: "{{ item.path }}"
|
path: "{{ item.path }}"
|
||||||
state: absent
|
state: absent
|
||||||
with_items: "{{ networkd_files.files }}"
|
with_items: "{{ networkd_files.files }}"
|
||||||
@ -145,7 +145,7 @@
|
|||||||
- systemd-networkd
|
- systemd-networkd
|
||||||
|
|
||||||
- name: Create systemd-networkd network device(s)
|
- name: Create systemd-networkd network device(s)
|
||||||
template:
|
ansible.builtin.template:
|
||||||
src: "systemd-netdev.j2"
|
src: "systemd-netdev.j2"
|
||||||
dest: "/etc/systemd/network/{{ item.1.filename }}.netdev"
|
dest: "/etc/systemd/network/{{ item.1.filename }}.netdev"
|
||||||
owner: "root"
|
owner: "root"
|
||||||
@ -249,10 +249,10 @@
|
|||||||
- Restart systemd-networkd
|
- Restart systemd-networkd
|
||||||
|
|
||||||
- name: Restart systemd_networkd prior to applying sysctl changes
|
- name: Restart systemd_networkd prior to applying sysctl changes
|
||||||
meta: flush_handlers
|
ansible.builtin.meta: flush_handlers
|
||||||
|
|
||||||
- name: Add IP Forward for interface
|
- name: Add IP Forward for interface
|
||||||
sysctl:
|
ansible.posix.sysctl:
|
||||||
name: "net.ipv4.conf.{{ item.1.interface }}.forwarding"
|
name: "net.ipv4.conf.{{ item.1.interface }}.forwarding"
|
||||||
value: 1
|
value: 1
|
||||||
sysctl_set: true
|
sysctl_set: true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user