diff options
| -rw-r--r-- | .ansible-lint-ignore | 3 | ||||
| -rw-r--r-- | roles/kolla-ansible-deploy/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/multi-node-managed-addressing/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/multi-node-vxlan-overlay/tasks/main.yml | 6 |
4 files changed, 9 insertions, 12 deletions
diff --git a/.ansible-lint-ignore b/.ansible-lint-ignore index d46687bee..4d826d03d 100644 --- a/.ansible-lint-ignore +++ b/.ansible-lint-ignore @@ -1,5 +1,2 @@ # This file contains ignores rule violations for ansible-lint skip etc/kolla/globals.yml yaml[comments] skip -roles/kolla-ansible-deploy/tasks/main.yml fqcn[action-core] skip -roles/multi-node-managed-addressing/tasks/main.yml fqcn[action-core] skip -roles/multi-node-vxlan-overlay/tasks/main.yml fqcn[action-core] skip diff --git a/roles/kolla-ansible-deploy/tasks/main.yml b/roles/kolla-ansible-deploy/tasks/main.yml index b2ec759cc..6f9f48e52 100644 --- a/roles/kolla-ansible-deploy/tasks/main.yml +++ b/roles/kolla-ansible-deploy/tasks/main.yml @@ -8,7 +8,7 @@ recurse: true - name: Import certificates.yml - import_tasks: certificates.yml + ansible.builtin.import_tasks: certificates.yml - name: Import deploy.yml - import_tasks: deploy.yml + ansible.builtin.import_tasks: deploy.yml diff --git a/roles/multi-node-managed-addressing/tasks/main.yml b/roles/multi-node-managed-addressing/tasks/main.yml index 925468b8b..0949746bb 100644 --- a/roles/multi-node-managed-addressing/tasks/main.yml +++ b/roles/multi-node-managed-addressing/tasks/main.yml @@ -1,7 +1,7 @@ --- # Not all variables have sensible defaults, let's ensure these are set. - name: Ensure mandatory variables are defined - assert: + ansible.builtin.assert: that: - managed_interface_name is defined - managed_network_prefix is defined @@ -9,7 +9,7 @@ - managed_network_address_family is defined - name: Set managed interface facts - set_fact: + ansible.builtin.set_fact: managed_interface_address: "{{ managed_network_prefix }}{{ groups['all'].index(inventory_hostname) + 1 }}" - name: Add IPv4 address for managed network @@ -36,7 +36,7 @@ - name: Accept traffic on the managed network (IN) become: true - iptables: + ansible.builtin.iptables: state: present action: insert chain: INPUT @@ -47,7 +47,7 @@ # NOTE(yoctozepto): the default policy is ACCEPT but it is nicer to get statistics - name: Accept traffic on the managed network (OUT) become: true - iptables: + ansible.builtin.iptables: state: present action: insert chain: OUTPUT diff --git a/roles/multi-node-vxlan-overlay/tasks/main.yml b/roles/multi-node-vxlan-overlay/tasks/main.yml index 27ae67bab..9855df21e 100644 --- a/roles/multi-node-vxlan-overlay/tasks/main.yml +++ b/roles/multi-node-vxlan-overlay/tasks/main.yml @@ -1,20 +1,20 @@ --- # Not all variables have sensible defaults, let's ensure these are set. - name: Ensure mandatory variables are defined - assert: + ansible.builtin.assert: that: - vxlan_interface_name is defined - vxlan_vni is defined - name: Set VXLAN interface facts - set_fact: + ansible.builtin.set_fact: tunnel_local_address: "{{ nodepool.private_ipv4 if nodepool.private_ipv4 | length > 0 else nodepool.public_ipv4 }}" # We have had cases where the nodepool private or public IP address is not assigned, # which causes hard to diagnose errors later on. Catch it early. - name: Assert that the nodepool private or public IPv4 address is assigned - assert: + ansible.builtin.assert: that: tunnel_local_address in ansible_all_ipv4_addresses fail_msg: >- The nodepool private/public IP address {{ tunnel_local_address }} is not assigned |