diff --git a/network_interfaces/redhat_interface_postdown-veth.cfg.j2 b/network_interfaces/redhat_interface_ifdown-post.cfg.j2 similarity index 100% rename from network_interfaces/redhat_interface_postdown-veth.cfg.j2 rename to network_interfaces/redhat_interface_ifdown-post.cfg.j2 diff --git a/network_interfaces/redhat_interface_postup-veth.cfg.j2 b/network_interfaces/redhat_interface_ifup-post.cfg.j2 similarity index 100% rename from network_interfaces/redhat_interface_postup-veth.cfg.j2 rename to network_interfaces/redhat_interface_ifup-post.cfg.j2 diff --git a/test-prepare-host.yml b/test-prepare-host.yml index fd908d5e..0bc7fb71 100644 --- a/test-prepare-host.yml +++ b/test-prepare-host.yml @@ -76,9 +76,10 @@ - name: Put down post-up script for veth-peer interfaces (RedHat) template: src: "network_interfaces/redhat_interface_{{ item[0] | default('default') }}.cfg.j2" - dest: "/etc/sysconfig/network-scripts/{{ item[0] }}-{{ item[1].name | default('br-mgmt') }}-2-{{ item[1].veth_peer | default('eth1') }}.sh" + dest: "/etc/sysconfig/network-scripts/{{ item[0] }}-veth-{{ item[1].name | default('br-mgmt') }}-2-{{ item[1].veth_peer | default('eth1') }}" + mode: "0755" with_nested: - - [ "postdown-veth", "postup-veth" ] + - [ "ifup-post", "ifdown-post" ] - "{{ bridges }}" when: - item[1].veth_peer is defined @@ -93,6 +94,18 @@ tags: - networking-interfaces-load + - name: Ensure the postup/postdown scripts are loaded (RedHat) + lineinfile: + dest: "/etc/sysconfig/network-scripts/{{ item[0] }}" + line: ". /etc/sysconfig/network-scripts/{{ item[0] }}-veth-{{ item[1].name | default('br-mgmt') }}-2-{{ item[1].veth_peer | default('eth1') }}" + insertbefore: "^exit 0" + with_nested: + - [ "ifup-post", "ifdown-post" ] + - "{{ bridges }}" + when: + - item[1].veth_peer is defined + - ansible_pkg_mgr == 'yum' + - name: Shut down the network interfaces command: "ifdown {{ item.name | default('br-mgmt') }}" when: