zuul/zuul-jobs
Code Issues Proposed changes

Remove "include:" usage from multi-node-bridge

Browse Source 
This is deprecated, and include_tasks is sufficient and present
in all supported versions.

Change-Id: If88d9d6ce9fb40a9a8e42e7a32d473ffd51b780a
This commit is contained in:
James E. Blair 2022-05-23 14:08:23 -07:00
parent 09d493916a
commit a1e6229171
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
roles/multi-node-bridge/tasks/main.yaml
View File

@ -1,24 +1,28 @@
# Note (dmsimard) # Note (dmsimard)
# We explicitely declare a PATH environment variable because '/sbin' is not in # We explicitely declare a PATH environment variable because '/sbin' is not in
# PATH when using 'become: yes' on some distributions # PATH when using 'become: yes' on some distributions
- include: common.yaml - include_tasks:
environment: file: common.yaml
PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin" apply:
environment:
PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
when: >- when: >-
inventory_hostname in groups['switch'] or inventory_hostname in groups['switch'] or
inventory_hostname in groups['peers'] inventory_hostname in groups['peers']
- include: switch.yaml - include_tasks:
environment: file: switch.yaml
PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin" apply:
environment:
PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
when: inventory_hostname in groups['switch'] when: inventory_hostname in groups['switch']
static: no
- include: peer.yaml - include_tasks:
environment: file: peer.yaml
PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin" apply:
environment:
PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
when: inventory_hostname in groups['peers'] when: inventory_hostname in groups['peers']
static: no
- name: Persist iptables rules - name: Persist iptables rules
include_role: include_role: