From b0166692883a561d40e59c6fcac14afcdc32e82b Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Thu, 29 Sep 2016 17:40:24 +0100
Subject: [PATCH] Fix postup/postdown on RedHat/CentOS hosts

The postup/postdown was not working because it was not executable, as
well as not being sourced as part of the ifup-post and ifdown-post
scripts.

Change-Id: Ica71a53b3e4d1fe82cd9045ae134372beba3f96c
---
 ...g.j2 => redhat_interface_ifdown-post.cfg.j2} |  0
 ...cfg.j2 => redhat_interface_ifup-post.cfg.j2} |  0
 test-prepare-host.yml                           | 17 +++++++++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)
 rename network_interfaces/{redhat_interface_postdown-veth.cfg.j2 => redhat_interface_ifdown-post.cfg.j2} (100%)
 rename network_interfaces/{redhat_interface_postup-veth.cfg.j2 => redhat_interface_ifup-post.cfg.j2} (100%)

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 dd074253..248f56f8 100644
--- a/test-prepare-host.yml
+++ b/test-prepare-host.yml
@@ -67,9 +67,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
@@ -84,6 +85,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: